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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 1839223003: Add basic Chrome interaction with the mash shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move chrome_launcher_prefs from ash to aura. Created 4 years, 8 months 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
« chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc ('K') | « chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc ('k') | chrome/common/pref_names.h » ('j') | chrome/common/pref_names.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 4e6905d336a6f0e08c0d0173dd2f30f37727aa21..45fc83e30213f601d533e72ba1e0ef59373aad47 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -525,8 +525,6 @@
'browser/ui/ash/cast_config_delegate_media_router.h',
'browser/ui/ash/chrome_keyboard_ui.cc',
'browser/ui/ash/chrome_keyboard_ui.h',
- 'browser/ui/ash/chrome_launcher_prefs.cc',
- 'browser/ui/ash/chrome_launcher_prefs.h',
'browser/ui/ash/chrome_new_window_delegate.cc',
'browser/ui/ash/chrome_new_window_delegate.h',
'browser/ui/ash/chrome_new_window_delegate_chromeos.cc',
@@ -659,6 +657,8 @@
],
# Cross-platform aura sources.
'chrome_browser_ui_aura_sources': [
+ 'browser/ui/ash/chrome_launcher_prefs.cc',
+ 'browser/ui/ash/chrome_launcher_prefs.h',
'browser/ui/aura/accessibility/automation_manager_aura.cc',
'browser/ui/aura/accessibility/automation_manager_aura.h',
'browser/ui/aura/accessibility/ax_root_obj_wrapper.cc',
« chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc ('K') | « chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc ('k') | chrome/common/pref_names.h » ('j') | chrome/common/pref_names.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698