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

Unified Diff: trunk/src/chrome/chrome_browser_ui.gypi

Issue 14096026: Revert 194594 "Make sure manifest specified shortcut for Extensi..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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
Index: trunk/src/chrome/chrome_browser_ui.gypi
===================================================================
--- trunk/src/chrome/chrome_browser_ui.gypi (revision 194596)
+++ trunk/src/chrome/chrome_browser_ui.gypi (working copy)
@@ -66,7 +66,6 @@
'sources': [
# All .cc, .h, .m, and .mm files under browser/ui except for:
# * tests and mocks.
- 'browser/ui/accelerator_utils.h',
'browser/ui/active_tab_tracker.cc',
'browser/ui/active_tab_tracker.h',
'browser/ui/alternate_error_tab_observer.cc',
@@ -325,7 +324,6 @@
'browser/ui/chrome_select_file_policy.h',
'browser/ui/chrome_style.cc',
'browser/ui/chrome_style.h',
- 'browser/ui/cocoa/accelerator_utils_cocoa.mm',
'browser/ui/cocoa/about_ipc_controller.h',
'browser/ui/cocoa/about_ipc_controller.mm',
'browser/ui/cocoa/about_ipc_dialog.h',
@@ -909,7 +907,6 @@
'browser/ui/global_error/global_error_service.h',
'browser/ui/global_error/global_error_service_factory.cc',
'browser/ui/global_error/global_error_service_factory.h',
- 'browser/ui/gtk/accelerator_utils_gtk.cc',
'browser/ui/gtk/accelerators_gtk.cc',
'browser/ui/gtk/accelerators_gtk.h',
'browser/ui/gtk/action_box_button_gtk.cc',
@@ -1351,8 +1348,8 @@
'browser/ui/sync/one_click_signin_infobar_delegate.h',
'browser/ui/sync/one_click_signin_sync_starter.cc',
'browser/ui/sync/one_click_signin_sync_starter.h',
- 'browser/ui/sync/profile_signin_confirmation_helper.cc',
- 'browser/ui/sync/profile_signin_confirmation_helper.h',
+ 'browser/ui/sync/profile_signin_confirmation_helper.cc',
+ 'browser/ui/sync/profile_signin_confirmation_helper.h',
'browser/ui/sync/signin_histogram.h',
'browser/ui/sync/tab_contents_synced_tab_delegate.cc',
'browser/ui/sync/tab_contents_synced_tab_delegate.h',
@@ -1427,8 +1424,6 @@
'browser/ui/unload_controller.h',
'browser/ui/user_data_dir_dialog.h',
'browser/ui/view_ids.h',
- 'browser/ui/views/accelerator_utils_aura.cc',
- 'browser/ui/views/accelerator_utils_views.cc',
'browser/ui/views/about_ipc_dialog.cc',
'browser/ui/views/about_ipc_dialog.h',
'browser/ui/views/accessibility/accessibility_event_router_views.cc',
Property changes on: trunk\src\chrome\chrome_browser_ui.gypi
___________________________________________________________________
Added: svn:mergeinfo

Powered by Google App Engine
This is Rietveld 408576698