chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm - Issue 1191373002: Componentize AutocompleteController and its supporting cast

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

Issue 1191373002: Componentize AutocompleteController and its supporting cast (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prep_builtin_provider_for_c14n

Patch Set: Rebase Created 5 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

« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm ('k') | chrome/browser/ui/omnibox/omnibox_controller.h » ('j') | no next file with comments »

OLD	NEW
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/foundation_util.h"	10 #include "base/mac/foundation_util.h"

11 #include "base/mac/mac_util.h"	11 #include "base/mac/mac_util.h"

12 #include "base/memory/singleton.h"	12 #include "base/memory/singleton.h"

13 #include "base/prefs/pref_service.h"	13 #include "base/prefs/pref_service.h"

14 #include "base/strings/string_util.h"	14 #include "base/strings/string_util.h"

15 #include "base/strings/sys_string_conversions.h"	15 #include "base/strings/sys_string_conversions.h"

16 #include "base/strings/utf_string_conversions.h"	16 #include "base/strings/utf_string_conversions.h"

17 #include "chrome/app/chrome_command_ids.h"	17 #include "chrome/app/chrome_command_ids.h"

18 #include "chrome/browser/autocomplete/autocomplete_classifier.h"

19 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"	18 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"

20 #include "chrome/browser/chrome_notification_types.h"	19 #include "chrome/browser/chrome_notification_types.h"

21 #include "chrome/browser/command_updater.h"	20 #include "chrome/browser/command_updater.h"

22 #include "chrome/browser/profiles/profile.h"	21 #include "chrome/browser/profiles/profile.h"

23 #include "chrome/browser/search/search.h"	22 #include "chrome/browser/search/search.h"

24 #include "chrome/browser/themes/theme_service.h"	23 #include "chrome/browser/themes/theme_service.h"

25 #include "chrome/browser/ui/browser.h"	24 #include "chrome/browser/ui/browser.h"

26 #include "chrome/browser/ui/browser_commands.h"	25 #include "chrome/browser/ui/browser_commands.h"

27 #include "chrome/browser/ui/browser_window.h"	26 #include "chrome/browser/ui/browser_window.h"

28 #import "chrome/browser/ui/cocoa/background_gradient_view.h"	27 #import "chrome/browser/ui/cocoa/background_gradient_view.h"

(...skipping 14 matching lines...) Expand all Loading...
43 #import "chrome/browser/ui/cocoa/view_id_util.h"	42 #import "chrome/browser/ui/cocoa/view_id_util.h"

44 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"	43 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"

45 #include "chrome/browser/ui/omnibox/omnibox_view.h"	44 #include "chrome/browser/ui/omnibox/omnibox_view.h"

46 #include "chrome/browser/ui/tabs/tab_strip_model.h"	45 #include "chrome/browser/ui/tabs/tab_strip_model.h"

47 #include "chrome/browser/ui/toolbar/wrench_menu_badge_controller.h"	46 #include "chrome/browser/ui/toolbar/wrench_menu_badge_controller.h"

48 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"	47 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"

49 #include "chrome/common/pref_names.h"	48 #include "chrome/common/pref_names.h"

50 #include "chrome/grit/chromium_strings.h"	49 #include "chrome/grit/chromium_strings.h"

51 #include "chrome/grit/generated_resources.h"	50 #include "chrome/grit/generated_resources.h"

52 #include "components/metrics/proto/omnibox_event.pb.h"	51 #include "components/metrics/proto/omnibox_event.pb.h"

	52 #include "components/omnibox/autocomplete_classifier.h"

53 #include "components/omnibox/autocomplete_match.h"	53 #include "components/omnibox/autocomplete_match.h"

54 #include "components/search_engines/template_url_service.h"	54 #include "components/search_engines/template_url_service.h"

55 #include "components/url_fixer/url_fixer.h"	55 #include "components/url_fixer/url_fixer.h"

56 #include "content/public/browser/web_contents.h"	56 #include "content/public/browser/web_contents.h"

57 #include "grit/theme_resources.h"	57 #include "grit/theme_resources.h"

58 #import "ui/base/cocoa/menu_controller.h"	58 #import "ui/base/cocoa/menu_controller.h"

59 #include "ui/base/l10n/l10n_util.h"	59 #include "ui/base/l10n/l10n_util.h"

60 #include "ui/base/l10n/l10n_util_mac.h"	60 #include "ui/base/l10n/l10n_util_mac.h"

61 #include "ui/gfx/geometry/rect.h"	61 #include "ui/gfx/geometry/rect.h"

62 #include "ui/gfx/image/image.h"	62 #include "ui/gfx/image/image.h"

(...skipping 819 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
882 - (void)hideDropURLsIndicatorInView:(NSView*)view {	882 - (void)hideDropURLsIndicatorInView:(NSView*)view {

883 // Do nothing.	883 // Do nothing.

884 }	884 }

885	885

886 // (URLDropTargetController protocol)	886 // (URLDropTargetController protocol)

887 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {	887 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {

888 return drag_util::IsUnsupportedDropData(profile_, info);	888 return drag_util::IsUnsupportedDropData(profile_, info);

889 }	889 }

890	890

891 @end	891 @end

OLD	NEW