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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 657443004: MacViews: Get views based toolbar to compile on the Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@views-findbar
Patch Set: Rebase Created 6 years, 2 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
« no previous file with comments | « chrome/browser/ui/cocoa/toolbar/toolbar_view_unittest.mm ('k') | no next file » | no next file with comments »
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 2a06e5018167cbba03a79b87334765c70b983a4e..67488b931f230df4ae89b85d5851a120a350ec13 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -720,14 +720,14 @@
'browser/ui/cocoa/themed_window.mm',
'browser/ui/cocoa/toolbar/back_forward_menu_controller.h',
'browser/ui/cocoa/toolbar/back_forward_menu_controller.mm',
- 'browser/ui/cocoa/toolbar/reload_button.h',
- 'browser/ui/cocoa/toolbar/reload_button.mm',
- 'browser/ui/cocoa/toolbar/toolbar_button.h',
- 'browser/ui/cocoa/toolbar/toolbar_button.mm',
+ 'browser/ui/cocoa/toolbar/reload_button_cocoa.h',
+ 'browser/ui/cocoa/toolbar/reload_button_cocoa.mm',
+ 'browser/ui/cocoa/toolbar/toolbar_button_cocoa.h',
+ 'browser/ui/cocoa/toolbar/toolbar_button_cocoa.mm',
'browser/ui/cocoa/toolbar/toolbar_controller.h',
'browser/ui/cocoa/toolbar/toolbar_controller.mm',
- 'browser/ui/cocoa/toolbar/toolbar_view.h',
- 'browser/ui/cocoa/toolbar/toolbar_view.mm',
+ 'browser/ui/cocoa/toolbar/toolbar_view_cocoa.h',
+ 'browser/ui/cocoa/toolbar/toolbar_view_cocoa.mm',
'browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.h',
'browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.mm',
'browser/ui/cocoa/translate/translate_bubble_controller.h',
@@ -2222,32 +2222,6 @@
'browser/ui/views/tabs/window_finder_win.cc',
'browser/ui/views/theme_image_mapper.cc',
'browser/ui/views/theme_image_mapper.h',
- 'browser/ui/views/toolbar/back_button.cc',
- 'browser/ui/views/toolbar/back_button.h',
- 'browser/ui/views/toolbar/browser_actions_container.cc',
- 'browser/ui/views/toolbar/browser_actions_container.h',
- 'browser/ui/views/toolbar/browser_actions_container_observer.h',
- 'browser/ui/views/toolbar/browser_action_test_util_views.cc',
- 'browser/ui/views/toolbar/browser_action_view.cc',
- 'browser/ui/views/toolbar/browser_action_view.h',
- 'browser/ui/views/toolbar/chevron_menu_button.cc',
- 'browser/ui/views/toolbar/chevron_menu_button.h',
- 'browser/ui/views/toolbar/extension_toolbar_menu_view.cc',
- 'browser/ui/views/toolbar/extension_toolbar_menu_view.h',
- 'browser/ui/views/toolbar/home_button.cc',
- 'browser/ui/views/toolbar/home_button.h',
- 'browser/ui/views/toolbar/reload_button.cc',
- 'browser/ui/views/toolbar/reload_button.h',
- 'browser/ui/views/toolbar/toolbar_action_view_delegate.h',
- 'browser/ui/views/toolbar/toolbar_button.cc',
- 'browser/ui/views/toolbar/toolbar_button.h',
- 'browser/ui/views/toolbar/toolbar_view.cc',
- 'browser/ui/views/toolbar/toolbar_view.h',
- 'browser/ui/views/toolbar/wrench_menu.cc',
- 'browser/ui/views/toolbar/wrench_menu.h',
- 'browser/ui/views/toolbar/wrench_menu_observer.h',
- 'browser/ui/views/toolbar/wrench_toolbar_button.cc',
- 'browser/ui/views/toolbar/wrench_toolbar_button.h',
'browser/ui/views/touch_uma/touch_uma.h',
'browser/ui/views/translate/translate_bubble_view.cc',
'browser/ui/views/translate/translate_bubble_view.h',
@@ -2283,6 +2257,32 @@
'browser/ui/views/find_bar_host.h',
'browser/ui/views/find_bar_view.cc',
'browser/ui/views/find_bar_view.h',
+ 'browser/ui/views/toolbar/back_button.cc',
+ 'browser/ui/views/toolbar/back_button.h',
+ 'browser/ui/views/toolbar/browser_actions_container.cc',
+ 'browser/ui/views/toolbar/browser_actions_container.h',
+ 'browser/ui/views/toolbar/browser_actions_container_observer.h',
+ 'browser/ui/views/toolbar/browser_action_test_util_views.cc',
+ 'browser/ui/views/toolbar/browser_action_view.cc',
+ 'browser/ui/views/toolbar/browser_action_view.h',
+ 'browser/ui/views/toolbar/chevron_menu_button.cc',
+ 'browser/ui/views/toolbar/chevron_menu_button.h',
+ 'browser/ui/views/toolbar/extension_toolbar_menu_view.cc',
+ 'browser/ui/views/toolbar/extension_toolbar_menu_view.h',
+ 'browser/ui/views/toolbar/home_button.cc',
+ 'browser/ui/views/toolbar/home_button.h',
+ 'browser/ui/views/toolbar/reload_button.cc',
+ 'browser/ui/views/toolbar/reload_button.h',
+ 'browser/ui/views/toolbar/toolbar_action_view_delegate.h',
+ 'browser/ui/views/toolbar/toolbar_button.cc',
+ 'browser/ui/views/toolbar/toolbar_button.h',
+ 'browser/ui/views/toolbar/toolbar_view.cc',
+ 'browser/ui/views/toolbar/toolbar_view.h',
+ 'browser/ui/views/toolbar/wrench_menu.cc',
+ 'browser/ui/views/toolbar/wrench_menu.h',
+ 'browser/ui/views/toolbar/wrench_menu_observer.h',
+ 'browser/ui/views/toolbar/wrench_toolbar_button.cc',
+ 'browser/ui/views/toolbar/wrench_toolbar_button.h',
],
# Views files for everwhere but ChromeOS.
'chrome_browser_ui_views_non_chromeos_sources': [
« no previous file with comments | « chrome/browser/ui/cocoa/toolbar/toolbar_view_unittest.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698