OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/ui/cocoa/toolbar_controller.h" | 5 #import "chrome/browser/ui/cocoa/toolbar/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/mac/nsimage_cache.h" | 11 #include "app/mac/nsimage_cache.h" |
12 #include "app/resource_bundle.h" | 12 #include "app/resource_bundle.h" |
13 #include "base/mac/mac_util.h" | 13 #include "base/mac/mac_util.h" |
14 #include "base/singleton.h" | 14 #include "base/singleton.h" |
15 #include "base/sys_string_conversions.h" | 15 #include "base/sys_string_conversions.h" |
16 #include "chrome/app/chrome_command_ids.h" | 16 #include "chrome/app/chrome_command_ids.h" |
17 #include "chrome/browser/autocomplete/autocomplete.h" | 17 #include "chrome/browser/autocomplete/autocomplete.h" |
18 #include "chrome/browser/autocomplete/autocomplete_classifier.h" | 18 #include "chrome/browser/autocomplete/autocomplete_classifier.h" |
19 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" | 19 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" |
20 #include "chrome/browser/autocomplete/autocomplete_match.h" | 20 #include "chrome/browser/autocomplete/autocomplete_match.h" |
21 #include "chrome/browser/background_page_tracker.h" | 21 #include "chrome/browser/background_page_tracker.h" |
22 #include "chrome/browser/net/url_fixer_upper.h" | 22 #include "chrome/browser/net/url_fixer_upper.h" |
23 #include "chrome/browser/prefs/pref_service.h" | 23 #include "chrome/browser/prefs/pref_service.h" |
24 #include "chrome/browser/profiles/profile.h" | 24 #include "chrome/browser/profiles/profile.h" |
25 #include "chrome/browser/search_engines/template_url_model.h" | 25 #include "chrome/browser/search_engines/template_url_model.h" |
26 #include "chrome/browser/tab_contents/tab_contents.h" | 26 #include "chrome/browser/tab_contents/tab_contents.h" |
27 #include "chrome/browser/themes/browser_theme_provider.h" | 27 #include "chrome/browser/themes/browser_theme_provider.h" |
28 #include "chrome/browser/upgrade_detector.h" | 28 #include "chrome/browser/upgrade_detector.h" |
29 #include "chrome/browser/ui/browser.h" | 29 #include "chrome/browser/ui/browser.h" |
30 #include "chrome/browser/ui/browser_window.h" | 30 #include "chrome/browser/ui/browser_window.h" |
31 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h" | 31 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h" |
32 #import "chrome/browser/ui/cocoa/back_forward_menu_controller.h" | |
33 #import "chrome/browser/ui/cocoa/background_gradient_view.h" | 32 #import "chrome/browser/ui/cocoa/background_gradient_view.h" |
34 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h" | 33 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h" |
35 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" | 34 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" |
36 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" | 35 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" |
37 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" | 36 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" |
38 #import "chrome/browser/ui/cocoa/gradient_button_cell.h" | 37 #import "chrome/browser/ui/cocoa/gradient_button_cell.h" |
39 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" | 38 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" |
40 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" | 39 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" |
41 #import "chrome/browser/ui/cocoa/menu_button.h" | 40 #import "chrome/browser/ui/cocoa/menu_button.h" |
42 #import "chrome/browser/ui/cocoa/menu_controller.h" | 41 #import "chrome/browser/ui/cocoa/menu_controller.h" |
43 #import "chrome/browser/ui/cocoa/reload_button.h" | 42 #import "chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h" |
44 #import "chrome/browser/ui/cocoa/toolbar_view.h" | 43 #import "chrome/browser/ui/cocoa/toolbar/reload_button.h" |
| 44 #import "chrome/browser/ui/cocoa/toolbar/toolbar_view.h" |
45 #import "chrome/browser/ui/cocoa/view_id_util.h" | 45 #import "chrome/browser/ui/cocoa/view_id_util.h" |
46 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h" | 46 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h" |
47 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 47 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
48 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" | 48 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" |
49 #include "chrome/common/notification_details.h" | 49 #include "chrome/common/notification_details.h" |
50 #include "chrome/common/notification_observer.h" | 50 #include "chrome/common/notification_observer.h" |
51 #include "chrome/common/notification_service.h" | 51 #include "chrome/common/notification_service.h" |
52 #include "chrome/common/notification_type.h" | 52 #include "chrome/common/notification_type.h" |
53 #include "chrome/common/pref_names.h" | 53 #include "chrome/common/pref_names.h" |
54 #include "gfx/rect.h" | 54 #include "gfx/rect.h" |
(...skipping 744 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
799 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point { | 799 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point { |
800 // Do nothing. | 800 // Do nothing. |
801 } | 801 } |
802 | 802 |
803 // (URLDropTargetController protocol) | 803 // (URLDropTargetController protocol) |
804 - (void)hideDropURLsIndicatorInView:(NSView*)view { | 804 - (void)hideDropURLsIndicatorInView:(NSView*)view { |
805 // Do nothing. | 805 // Do nothing. |
806 } | 806 } |
807 | 807 |
808 @end | 808 @end |
OLD | NEW |