| OLD | NEW |
|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import "chrome/browser/cocoa/toolbar_controller.h" | 5 #import "chrome/browser/cocoa/toolbar_controller.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
| 10 #include "app/l10n_util_mac.h" | 10 #include "app/l10n_util_mac.h" |
| 11 #include "app/menus/accelerator_cocoa.h" | 11 #include "app/menus/accelerator_cocoa.h" |
| 12 #include "app/menus/menu_model.h" | 12 #include "app/menus/menu_model.h" |
| 13 #include "base/mac_util.h" | 13 #include "base/mac_util.h" |
| 14 #include "base/nsimage_cache_mac.h" | 14 #include "base/nsimage_cache_mac.h" |
| 15 #include "base/singleton.h" | 15 #include "base/singleton.h" |
| 16 #include "base/sys_string_conversions.h" | 16 #include "base/sys_string_conversions.h" |
| 17 #include "chrome/app/chrome_dll_resource.h" | 17 #include "chrome/app/chrome_dll_resource.h" |
| 18 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" | 18 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" |
| 19 #include "chrome/browser/browser.h" | 19 #include "chrome/browser/browser.h" |
| 20 #include "chrome/browser/browser_theme_provider.h" | |
| 21 #include "chrome/browser/browser_window.h" | 20 #include "chrome/browser/browser_window.h" |
| 22 #import "chrome/browser/cocoa/accelerators_cocoa.h" | 21 #import "chrome/browser/cocoa/accelerators_cocoa.h" |
| 23 #import "chrome/browser/cocoa/back_forward_menu_controller.h" | 22 #import "chrome/browser/cocoa/back_forward_menu_controller.h" |
| 24 #import "chrome/browser/cocoa/background_gradient_view.h" | 23 #import "chrome/browser/cocoa/background_gradient_view.h" |
| 25 #import "chrome/browser/cocoa/encoding_menu_controller_delegate_mac.h" | 24 #import "chrome/browser/cocoa/encoding_menu_controller_delegate_mac.h" |
| 26 #import "chrome/browser/cocoa/extensions/browser_action_button.h" | 25 #import "chrome/browser/cocoa/extensions/browser_action_button.h" |
| 27 #import "chrome/browser/cocoa/extensions/browser_actions_container_view.h" | 26 #import "chrome/browser/cocoa/extensions/browser_actions_container_view.h" |
| 28 #import "chrome/browser/cocoa/extensions/browser_actions_controller.h" | 27 #import "chrome/browser/cocoa/extensions/browser_actions_controller.h" |
| 29 #import "chrome/browser/cocoa/gradient_button_cell.h" | 28 #import "chrome/browser/cocoa/gradient_button_cell.h" |
| 30 #import "chrome/browser/cocoa/location_bar/autocomplete_text_field_editor.h" | 29 #import "chrome/browser/cocoa/location_bar/autocomplete_text_field_editor.h" |
| 31 #import "chrome/browser/cocoa/location_bar/location_bar_view_mac.h" | 30 #import "chrome/browser/cocoa/location_bar/location_bar_view_mac.h" |
| 32 #import "chrome/browser/cocoa/menu_button.h" | 31 #import "chrome/browser/cocoa/menu_button.h" |
| 33 #import "chrome/browser/cocoa/menu_controller.h" | 32 #import "chrome/browser/cocoa/menu_controller.h" |
| 34 #import "chrome/browser/cocoa/reload_button.h" | 33 #import "chrome/browser/cocoa/reload_button.h" |
| 35 #import "chrome/browser/cocoa/toolbar_view.h" | 34 #import "chrome/browser/cocoa/toolbar_view.h" |
| 36 #import "chrome/browser/cocoa/view_id_util.h" | 35 #import "chrome/browser/cocoa/view_id_util.h" |
| 37 #import "chrome/browser/cocoa/wrench_menu_controller.h" | 36 #import "chrome/browser/cocoa/wrench_menu_controller.h" |
| 38 #include "chrome/browser/net/url_fixer_upper.h" | 37 #include "chrome/browser/net/url_fixer_upper.h" |
| 39 #include "chrome/browser/pref_service.h" | 38 #include "chrome/browser/pref_service.h" |
| 40 #include "chrome/browser/profile.h" | 39 #include "chrome/browser/profile.h" |
| 41 #include "chrome/browser/search_engines/template_url_model.h" | 40 #include "chrome/browser/search_engines/template_url_model.h" |
| 42 #include "chrome/browser/tab_contents/tab_contents.h" | 41 #include "chrome/browser/tab_contents/tab_contents.h" |
| 42 #include "chrome/browser/themes/browser_theme_provider.h" |
| 43 #include "chrome/browser/toolbar_model.h" | 43 #include "chrome/browser/toolbar_model.h" |
| 44 #include "chrome/browser/upgrade_detector.h" | 44 #include "chrome/browser/upgrade_detector.h" |
| 45 #include "chrome/browser/wrench_menu_model.h" | 45 #include "chrome/browser/wrench_menu_model.h" |
| 46 #include "chrome/common/notification_details.h" | 46 #include "chrome/common/notification_details.h" |
| 47 #include "chrome/common/notification_observer.h" | 47 #include "chrome/common/notification_observer.h" |
| 48 #include "chrome/common/notification_service.h" | 48 #include "chrome/common/notification_service.h" |
| 49 #include "chrome/common/notification_type.h" | 49 #include "chrome/common/notification_type.h" |
| 50 #include "chrome/common/pref_names.h" | 50 #include "chrome/common/pref_names.h" |
| 51 #include "gfx/rect.h" | 51 #include "gfx/rect.h" |
| 52 #include "grit/chromium_strings.h" | 52 #include "grit/chromium_strings.h" |
| (...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 758 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point { | 758 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point { |
| 759 // Do nothing. | 759 // Do nothing. |
| 760 } | 760 } |
| 761 | 761 |
| 762 // (URLDropTargetController protocol) | 762 // (URLDropTargetController protocol) |
| 763 - (void)hideDropURLsIndicatorInView:(NSView*)view { | 763 - (void)hideDropURLsIndicatorInView:(NSView*)view { |
| 764 // Do nothing. | 764 // Do nothing. |
| 765 } | 765 } |
| 766 | 766 |
| 767 @end | 767 @end |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 3173043:
Move theme files in chrome/browser/ into a themes/ subdir. (Closed)
Base URL: http://src.chromium.org/git/chromium.git