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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

Issue 368273011: Revert of Componentize TemplateURLService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm ('k') | chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/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 "base/mac/bundle_locations.h" 9 #include "base/mac/bundle_locations.h"
10 #include "base/mac/mac_util.h" 10 #include "base/mac/mac_util.h"
11 #include "base/memory/singleton.h" 11 #include "base/memory/singleton.h"
12 #include "base/prefs/pref_service.h" 12 #include "base/prefs/pref_service.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/strings/sys_string_conversions.h" 14 #include "base/strings/sys_string_conversions.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_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_classifier.h" 17 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
18 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" 18 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
19 #include "chrome/browser/autocomplete/autocomplete_match.h" 19 #include "chrome/browser/autocomplete/autocomplete_match.h"
20 #include "chrome/browser/chrome_notification_types.h" 20 #include "chrome/browser/chrome_notification_types.h"
21 #include "chrome/browser/command_updater.h" 21 #include "chrome/browser/command_updater.h"
22 #include "chrome/browser/profiles/profile.h" 22 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/search/search.h" 23 #include "chrome/browser/search/search.h"
24 #include "chrome/browser/search_engines/template_url_service.h"
24 #include "chrome/browser/themes/theme_service.h" 25 #include "chrome/browser/themes/theme_service.h"
25 #include "chrome/browser/ui/browser.h" 26 #include "chrome/browser/ui/browser.h"
26 #include "chrome/browser/ui/browser_window.h" 27 #include "chrome/browser/ui/browser_window.h"
27 #import "chrome/browser/ui/cocoa/background_gradient_view.h" 28 #import "chrome/browser/ui/cocoa/background_gradient_view.h"
28 #include "chrome/browser/ui/cocoa/drag_util.h" 29 #include "chrome/browser/ui/cocoa/drag_util.h"
29 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" 30 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
30 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" 31 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"
31 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" 32 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
32 #import "chrome/browser/ui/cocoa/gradient_button_cell.h" 33 #import "chrome/browser/ui/cocoa/gradient_button_cell.h"
33 #import "chrome/browser/ui/cocoa/image_button_cell.h" 34 #import "chrome/browser/ui/cocoa/image_button_cell.h"
34 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" 35 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
35 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" 36 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
36 #import "chrome/browser/ui/cocoa/menu_button.h" 37 #import "chrome/browser/ui/cocoa/menu_button.h"
37 #import "chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h" 38 #import "chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h"
38 #import "chrome/browser/ui/cocoa/toolbar/reload_button.h" 39 #import "chrome/browser/ui/cocoa/toolbar/reload_button.h"
39 #import "chrome/browser/ui/cocoa/toolbar/toolbar_button.h" 40 #import "chrome/browser/ui/cocoa/toolbar/toolbar_button.h"
40 #import "chrome/browser/ui/cocoa/toolbar/toolbar_view.h" 41 #import "chrome/browser/ui/cocoa/toolbar/toolbar_view.h"
41 #import "chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.h" 42 #import "chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.h"
42 #import "chrome/browser/ui/cocoa/view_id_util.h" 43 #import "chrome/browser/ui/cocoa/view_id_util.h"
43 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h" 44 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
44 #include "chrome/browser/ui/global_error/global_error_service.h" 45 #include "chrome/browser/ui/global_error/global_error_service.h"
45 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 46 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
46 #include "chrome/browser/ui/omnibox/omnibox_view.h" 47 #include "chrome/browser/ui/omnibox/omnibox_view.h"
47 #include "chrome/browser/ui/tabs/tab_strip_model.h" 48 #include "chrome/browser/ui/tabs/tab_strip_model.h"
48 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" 49 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
49 #include "chrome/browser/upgrade_detector.h" 50 #include "chrome/browser/upgrade_detector.h"
50 #include "chrome/common/pref_names.h" 51 #include "chrome/common/pref_names.h"
51 #include "components/metrics/proto/omnibox_event.pb.h" 52 #include "components/metrics/proto/omnibox_event.pb.h"
52 #include "components/search_engines/template_url_service.h"
53 #include "components/url_fixer/url_fixer.h" 53 #include "components/url_fixer/url_fixer.h"
54 #include "content/public/browser/notification_details.h" 54 #include "content/public/browser/notification_details.h"
55 #include "content/public/browser/notification_observer.h" 55 #include "content/public/browser/notification_observer.h"
56 #include "content/public/browser/notification_service.h" 56 #include "content/public/browser/notification_service.h"
57 #include "content/public/browser/web_contents.h" 57 #include "content/public/browser/web_contents.h"
58 #include "grit/chromium_strings.h" 58 #include "grit/chromium_strings.h"
59 #include "grit/generated_resources.h" 59 #include "grit/generated_resources.h"
60 #include "grit/theme_resources.h" 60 #include "grit/theme_resources.h"
61 #import "ui/base/cocoa/menu_controller.h" 61 #import "ui/base/cocoa/menu_controller.h"
62 #include "ui/base/l10n/l10n_util.h" 62 #include "ui/base/l10n/l10n_util.h"
(...skipping 791 matching lines...) Expand 10 before | Expand all | Expand 10 after
854 - (void)hideDropURLsIndicatorInView:(NSView*)view { 854 - (void)hideDropURLsIndicatorInView:(NSView*)view {
855 // Do nothing. 855 // Do nothing.
856 } 856 }
857 857
858 // (URLDropTargetController protocol) 858 // (URLDropTargetController protocol)
859 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info { 859 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
860 return drag_util::IsUnsupportedDropData(profile_, info); 860 return drag_util::IsUnsupportedDropData(profile_, info);
861 } 861 }
862 862
863 @end 863 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm ('k') | chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698