Index: chrome/chrome_browser_extensions.gypi |
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi |
index dd5733232ee069bfa1d2b4d842f7ff066e9ac1b9..8919b911d27b3b544e41c1c6ee14990bc9b04774 100644 |
--- a/chrome/chrome_browser_extensions.gypi |
+++ b/chrome/chrome_browser_extensions.gypi |
@@ -39,6 +39,28 @@ |
'browser/extensions/api/image_writer_private/operation_nonchromeos.cc', |
'browser/extensions/api/image_writer_private/removable_storage_provider_linux.cc', |
], |
+ 'chrome_browser_extensions_non_athena_sources': [ |
+ 'browser/extensions/api/desktop_capture/desktop_capture_api.cc', |
+ 'browser/extensions/api/desktop_capture/desktop_capture_api.h', |
+ 'browser/extensions/api/sessions/session_id.cc', |
+ 'browser/extensions/api/sessions/session_id.h', |
+ 'browser/extensions/api/sessions/sessions_api.cc', |
+ 'browser/extensions/api/sessions/sessions_api.h', |
+ 'browser/extensions/api/tab_capture/tab_capture_api.cc', |
+ 'browser/extensions/api/tab_capture/tab_capture_api.h', |
+ 'browser/extensions/api/tab_capture/tab_capture_registry.cc', |
+ 'browser/extensions/api/tab_capture/tab_capture_registry.h', |
+ 'browser/extensions/api/tabs/tabs_api.cc', |
+ 'browser/extensions/api/tabs/tabs_api.h', |
+ 'browser/extensions/api/tabs/tabs_event_router.cc', |
+ 'browser/extensions/api/tabs/tabs_event_router.h', |
+ 'browser/extensions/api/tabs/tabs_windows_api.cc', |
+ 'browser/extensions/api/tabs/tabs_windows_api.h', |
+ 'browser/extensions/api/tabs/windows_event_router.cc', |
+ 'browser/extensions/api/tabs/windows_event_router.h', |
+ 'browser/extensions/api/tabs/windows_util.cc', |
+ 'browser/extensions/api/tabs/windows_util.h', |
+ ], |
'chrome_browser_extensions_enabled_sources': [ |
'browser/apps/app_launch_for_metro_restart_win.cc', |
'browser/apps/app_launch_for_metro_restart_win.h', |
@@ -180,8 +202,6 @@ |
'browser/extensions/api/declarative_content/content_constants.h', |
'browser/extensions/api/declarative_content/chrome_content_rules_registry.cc', |
'browser/extensions/api/declarative_content/chrome_content_rules_registry.h', |
- 'browser/extensions/api/desktop_capture/desktop_capture_api.cc', |
- 'browser/extensions/api/desktop_capture/desktop_capture_api.h', |
'browser/extensions/api/developer_private/developer_private_api.cc', |
'browser/extensions/api/developer_private/developer_private_api.h', |
'browser/extensions/api/developer_private/entry_picker.cc', |
@@ -406,10 +426,6 @@ |
'browser/extensions/api/runtime/chrome_runtime_api_delegate.h', |
'browser/extensions/api/screenlock_private/screenlock_private_api.cc', |
'browser/extensions/api/screenlock_private/screenlock_private_api.h', |
- 'browser/extensions/api/sessions/session_id.cc', |
- 'browser/extensions/api/sessions/session_id.h', |
- 'browser/extensions/api/sessions/sessions_api.cc', |
- 'browser/extensions/api/sessions/sessions_api.h', |
'browser/extensions/api/settings_overrides/settings_overrides_api.cc', |
'browser/extensions/api/settings_overrides/settings_overrides_api.h', |
'browser/extensions/api/signed_in_devices/id_mapping_helper.cc', |
@@ -451,22 +467,8 @@ |
'browser/extensions/api/system_indicator/system_indicator_manager_factory.h', |
'browser/extensions/api/system_private/system_private_api.cc', |
'browser/extensions/api/system_private/system_private_api.h', |
- 'browser/extensions/api/tab_capture/tab_capture_api.cc', |
- 'browser/extensions/api/tab_capture/tab_capture_api.h', |
- 'browser/extensions/api/tab_capture/tab_capture_registry.cc', |
- 'browser/extensions/api/tab_capture/tab_capture_registry.h', |
- 'browser/extensions/api/tabs/tabs_api.cc', |
- 'browser/extensions/api/tabs/tabs_api.h', |
'browser/extensions/api/tabs/tabs_constants.cc', |
'browser/extensions/api/tabs/tabs_constants.h', |
- 'browser/extensions/api/tabs/tabs_event_router.cc', |
- 'browser/extensions/api/tabs/tabs_event_router.h', |
- 'browser/extensions/api/tabs/tabs_windows_api.cc', |
- 'browser/extensions/api/tabs/tabs_windows_api.h', |
- 'browser/extensions/api/tabs/windows_event_router.cc', |
- 'browser/extensions/api/tabs/windows_event_router.h', |
- 'browser/extensions/api/tabs/windows_util.cc', |
- 'browser/extensions/api/tabs/windows_util.h', |
'browser/extensions/api/top_sites/top_sites_api.cc', |
'browser/extensions/api/top_sites/top_sites_api.h', |
'browser/extensions/api/web_navigation/frame_navigation_state.cc', |
@@ -974,6 +976,13 @@ |
'../ui/keyboard/keyboard.gyp:keyboard_resources', |
], |
}], |
+ ['use_athena==1', { |
+ 'defines': ['USE_ATHENA=1'], |
+ }, { # use_athena==0 |
+ 'sources': [ |
+ '<@(chrome_browser_extensions_non_athena_sources)', |
+ ], |
+ }], |
['OS=="linux"', { |
'conditions': [ |
['use_aura==1', { |