diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-24 17:42:32 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-24 17:42:32 +0000 |
| commit | 7c3b7003d5f513a2608ec6586901d6367a21b0e6 (patch) | |
| tree | c50d5350c229404c9e6484e5ac04b5ac44a8544c /win8/metro_driver/metro_driver.gyp | |
| parent | 3c17ae74d8ead9a9117c7837f832da0d02a225fa (diff) | |
| download | chromium_src-7c3b7003d5f513a2608ec6586901d6367a21b0e6.zip chromium_src-7c3b7003d5f513a2608ec6586901d6367a21b0e6.tar.gz chromium_src-7c3b7003d5f513a2608ec6586901d6367a21b0e6.tar.bz2 | |
Split ash and non-ash metro driver code
ChromeAppViewFactory now produces ChromeAppView or ChromeAppViewAsh depending on the use_aura gyp flag.
The two versions have very little in common. Overt time they might share more code.
BUG=151718
TEST=see bug
Review URL: https://codereview.chromium.org/11233070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163860 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8/metro_driver/metro_driver.gyp')
| -rw-r--r-- | win8/metro_driver/metro_driver.gyp | 60 |
1 files changed, 36 insertions, 24 deletions
diff --git a/win8/metro_driver/metro_driver.gyp b/win8/metro_driver/metro_driver.gyp index e3ecf17..3379f07 100644 --- a/win8/metro_driver/metro_driver.gyp +++ b/win8/metro_driver/metro_driver.gyp @@ -35,35 +35,47 @@ '../win8.gyp:check_sdk_patch', ], 'sources': [ - 'chrome_app_view.cc', - 'chrome_app_view.h', - 'chrome_url_launch_handler.cc', - 'chrome_url_launch_handler.h', - '../delegate_execute/chrome_util.cc', - '../delegate_execute/chrome_util.h', - 'devices_handler.cc', - 'devices_handler.h', - 'direct3d_helper.cc', - 'direct3d_helper.h', - 'file_picker.h', - 'file_picker.cc', - 'metro_dialog_box.cc', - 'metro_dialog_box.h', 'metro_driver.cc', - 'print_handler.cc', - 'print_handler.h', - 'print_document_source.cc', - 'print_document_source.h', - 'secondary_tile.h', - 'secondary_tile.cc', - 'settings_handler.cc', - 'settings_handler.h', + 'metro_driver.h', 'stdafx.h', - 'toast_notification_handler.cc', - 'toast_notification_handler.h', 'winrt_utils.cc', 'winrt_utils.h', ], + 'conditions': [ + ['use_aura==1', { + 'sources': [ + 'chrome_app_view_ash.cc', + 'chrome_app_view_ash.h', + 'direct3d_helper.cc', + 'direct3d_helper.h', + ], + }, { # use_aura!=1 + 'sources': [ + 'chrome_app_view.cc', + 'chrome_app_view.h', + 'chrome_url_launch_handler.cc', + 'chrome_url_launch_handler.h', + '../delegate_execute/chrome_util.cc', + '../delegate_execute/chrome_util.h', + 'devices_handler.cc', + 'devices_handler.h', + 'file_picker.h', + 'file_picker.cc', + 'metro_dialog_box.cc', + 'metro_dialog_box.h', + 'print_handler.cc', + 'print_handler.h', + 'print_document_source.cc', + 'print_document_source.h', + 'secondary_tile.h', + 'secondary_tile.cc', + 'settings_handler.cc', + 'settings_handler.h', + 'toast_notification_handler.cc', + 'toast_notification_handler.h', + ], + }], + ], 'copies': [ { 'destination': '<(PRODUCT_DIR)', |