From 9afc2daf75c3bc01f8a39dcaa787061d3c8a57fb Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Wed, 16 Jul 2014 15:49:40 +0800 Subject: [PATCH] Only ship high DPI paks on Window. --- atom.gyp | 4 ---- atom/app/atom_main_delegate.cc | 2 ++ script/create-dist.py | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/atom.gyp b/atom.gyp index 0ff53fc01a..6b0a7fa499 100644 --- a/atom.gyp +++ b/atom.gyp @@ -393,8 +393,6 @@ '<(libchromiumcontent_library_dir)/libffmpegsumo.so', '<(libchromiumcontent_resources_dir)/icudtl.dat', '<(libchromiumcontent_resources_dir)/content_shell.pak', - '<(libchromiumcontent_resources_dir)/ui_resources_200_percent.pak', - '<(libchromiumcontent_resources_dir)/webkit_resources_200_percent.pak', ], }, { @@ -656,8 +654,6 @@ 'mac_bundle_resources': [ 'atom/common/resources/mac/MainMenu.xib', '<(libchromiumcontent_resources_dir)/content_shell.pak', - '<(libchromiumcontent_resources_dir)/ui_resources_200_percent.pak', - '<(libchromiumcontent_resources_dir)/webkit_resources_200_percent.pak', '<(libchromiumcontent_resources_dir)/icudtl.dat', ], 'xcode_settings': { diff --git a/atom/app/atom_main_delegate.cc b/atom/app/atom_main_delegate.cc index 47dc9dad67..e77814b06c 100644 --- a/atom/app/atom_main_delegate.cc +++ b/atom/app/atom_main_delegate.cc @@ -24,12 +24,14 @@ AtomMainDelegate::~AtomMainDelegate() { void AtomMainDelegate::AddDataPackFromPath( ui::ResourceBundle* bundle, const base::FilePath& pak_dir) { +#if defined(OS_WIN) bundle->AddDataPackFromPath( pak_dir.Append(FILE_PATH_LITERAL("ui_resources_200_percent.pak")), ui::SCALE_FACTOR_200P); bundle->AddDataPackFromPath( pak_dir.Append(FILE_PATH_LITERAL("webkit_resources_200_percent.pak")), ui::SCALE_FACTOR_200P); +#endif } bool AtomMainDelegate::BasicStartupComplete(int* exit_code) { diff --git a/script/create-dist.py b/script/create-dist.py index d321f0bfea..0ebb2da0ee 100755 --- a/script/create-dist.py +++ b/script/create-dist.py @@ -50,8 +50,6 @@ TARGET_BINARIES = { 'content_shell.pak', 'libchromiumcontent.so', 'libffmpegsumo.so', - 'ui_resources_200_percent.pak', - 'webkit_resources_200_percent.pak', ], } TARGET_DIRECTORIES = {