Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(669)

Unified Diff: chrome/chrome_browser_extensions.gypi

Issue 697803002: Use a stub implementation of GlobalShortcutListener for Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash47_media_stub
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/global_shortcut_listener_athena.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser_extensions.gypi
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index fd1035e37f3bb33f9d2e8f08272e103c75f811c0..3f3e0519dc1e20f5980a03c85cc35ad73ed30378 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -47,6 +47,14 @@
'browser/extensions/api/messaging/native_process_launcher.h',
'browser/extensions/api/messaging/native_process_launcher_posix.cc',
'browser/extensions/api/messaging/native_process_launcher_win.cc',
+ 'browser/extensions/global_shortcut_listener_mac.h',
+ 'browser/extensions/global_shortcut_listener_mac.mm',
+ 'browser/extensions/global_shortcut_listener_ozone.cc',
+ 'browser/extensions/global_shortcut_listener_ozone.h',
+ 'browser/extensions/global_shortcut_listener_win.cc',
+ 'browser/extensions/global_shortcut_listener_win.h',
+ 'browser/extensions/global_shortcut_listener_x11.cc',
+ 'browser/extensions/global_shortcut_listener_x11.h',
],
'chrome_browser_extensions_enabled_sources': [
'browser/apps/app_launch_for_metro_restart_win.cc',
@@ -690,16 +698,6 @@
'browser/extensions/favicon_downloader.h',
'browser/extensions/global_shortcut_listener.cc',
'browser/extensions/global_shortcut_listener.h',
- 'browser/extensions/global_shortcut_listener_chromeos.cc',
- 'browser/extensions/global_shortcut_listener_chromeos.h',
- 'browser/extensions/global_shortcut_listener_mac.h',
- 'browser/extensions/global_shortcut_listener_mac.mm',
- 'browser/extensions/global_shortcut_listener_ozone.cc',
- 'browser/extensions/global_shortcut_listener_ozone.h',
- 'browser/extensions/global_shortcut_listener_win.cc',
- 'browser/extensions/global_shortcut_listener_win.h',
- 'browser/extensions/global_shortcut_listener_x11.cc',
- 'browser/extensions/global_shortcut_listener_x11.h',
'browser/extensions/install_observer.cc',
'browser/extensions/install_observer.h',
'browser/extensions/install_signer.cc',
@@ -872,11 +870,17 @@
'browser/extensions/display_info_provider_chromeos.h',
'browser/extensions/extension_tab_util.cc',
],
+ 'chrome_browser_extensions_chromeos_non_athena_sources': [
+ 'browser/extensions/global_shortcut_listener_chromeos.cc',
+ 'browser/extensions/global_shortcut_listener_chromeos.h',
+ ],
'chrome_browser_extensions_athena_sources': [
'browser/extensions/api/tabs/tabs_api_athena.cc',
'browser/extensions/display_info_provider_athena.cc',
'browser/extensions/display_info_provider_athena.h',
'browser/extensions/extension_tab_util_athena.cc',
+ 'browser/extensions/global_shortcut_listener_athena.cc',
+ 'browser/extensions/global_shortcut_listener_athena.h',
],
},
# ----------------------------------------------------------------------------
@@ -1001,6 +1005,11 @@
'sources': ['<@(chrome_browser_extensions_athena_sources)'],
}, {
'sources': ['<@(chrome_browser_extensions_non_athena_sources)'],
+ 'conditions': [
+ ['chromeos==1', {
+ 'sources': [ '<@(chrome_browser_extensions_chromeos_non_athena_sources)'],
+ }],
+ ],
}],
['OS=="linux"', {
'conditions': [
« no previous file with comments | « chrome/browser/extensions/global_shortcut_listener_athena.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698