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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/toolbar/toolbar_controller.h ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm » ('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/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/mac/sdk_forward_declarations.h" 12 #include "base/mac/sdk_forward_declarations.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/singleton.h" 14 #include "base/memory/singleton.h"
15 #include "base/prefs/pref_service.h"
16 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
17 #include "base/strings/sys_string_conversions.h" 16 #include "base/strings/sys_string_conversions.h"
18 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
19 #include "chrome/app/chrome_command_ids.h" 18 #include "chrome/app/chrome_command_ids.h"
20 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" 19 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
21 #include "chrome/browser/chrome_notification_types.h" 20 #include "chrome/browser/chrome_notification_types.h"
22 #include "chrome/browser/command_observer.h" 21 #include "chrome/browser/command_observer.h"
23 #include "chrome/browser/command_updater.h" 22 #include "chrome/browser/command_updater.h"
24 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
25 #include "chrome/browser/search/search.h" 24 #include "chrome/browser/search/search.h"
(...skipping 22 matching lines...) Expand all
48 #include "chrome/browser/ui/tabs/tab_strip_model.h" 47 #include "chrome/browser/ui/tabs/tab_strip_model.h"
49 #include "chrome/browser/ui/toolbar/app_menu_badge_controller.h" 48 #include "chrome/browser/ui/toolbar/app_menu_badge_controller.h"
50 #include "chrome/browser/ui/toolbar/app_menu_model.h" 49 #include "chrome/browser/ui/toolbar/app_menu_model.h"
51 #include "chrome/common/pref_names.h" 50 #include "chrome/common/pref_names.h"
52 #include "chrome/grit/chromium_strings.h" 51 #include "chrome/grit/chromium_strings.h"
53 #include "chrome/grit/generated_resources.h" 52 #include "chrome/grit/generated_resources.h"
54 #include "components/metrics/proto/omnibox_event.pb.h" 53 #include "components/metrics/proto/omnibox_event.pb.h"
55 #include "components/omnibox/browser/autocomplete_classifier.h" 54 #include "components/omnibox/browser/autocomplete_classifier.h"
56 #include "components/omnibox/browser/autocomplete_match.h" 55 #include "components/omnibox/browser/autocomplete_match.h"
57 #include "components/omnibox/browser/omnibox_view.h" 56 #include "components/omnibox/browser/omnibox_view.h"
57 #include "components/prefs/pref_service.h"
58 #include "components/search_engines/template_url_service.h" 58 #include "components/search_engines/template_url_service.h"
59 #include "components/url_formatter/url_fixer.h" 59 #include "components/url_formatter/url_fixer.h"
60 #include "content/public/browser/web_contents.h" 60 #include "content/public/browser/web_contents.h"
61 #include "grit/components_strings.h" 61 #include "grit/components_strings.h"
62 #include "grit/theme_resources.h" 62 #include "grit/theme_resources.h"
63 #import "ui/base/cocoa/menu_controller.h" 63 #import "ui/base/cocoa/menu_controller.h"
64 #include "ui/base/l10n/l10n_util.h" 64 #include "ui/base/l10n/l10n_util.h"
65 #include "ui/base/l10n/l10n_util_mac.h" 65 #include "ui/base/l10n/l10n_util_mac.h"
66 #include "ui/gfx/geometry/rect.h" 66 #include "ui/gfx/geometry/rect.h"
67 #include "ui/gfx/image/image.h" 67 #include "ui/gfx/image/image.h"
(...skipping 913 matching lines...) Expand 10 before | Expand all | Expand 10 after
981 - (void)hideDropURLsIndicatorInView:(NSView*)view { 981 - (void)hideDropURLsIndicatorInView:(NSView*)view {
982 // Do nothing. 982 // Do nothing.
983 } 983 }
984 984
985 // (URLDropTargetController protocol) 985 // (URLDropTargetController protocol)
986 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info { 986 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
987 return drag_util::IsUnsupportedDropData(profile_, info); 987 return drag_util::IsUnsupportedDropData(profile_, info);
988 } 988 }
989 989
990 @end 990 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/toolbar/toolbar_controller.h ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698