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

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

Issue 2276823003: Change many chrome/browser includes to use qualified paths. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 3 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
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"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "chrome/common/pref_names.h" 51 #include "chrome/common/pref_names.h"
52 #include "chrome/grit/chromium_strings.h" 52 #include "chrome/grit/chromium_strings.h"
53 #include "chrome/grit/generated_resources.h" 53 #include "chrome/grit/generated_resources.h"
54 #include "components/metrics/proto/omnibox_event.pb.h" 54 #include "components/metrics/proto/omnibox_event.pb.h"
55 #include "components/omnibox/browser/autocomplete_classifier.h" 55 #include "components/omnibox/browser/autocomplete_classifier.h"
56 #include "components/omnibox/browser/autocomplete_match.h" 56 #include "components/omnibox/browser/autocomplete_match.h"
57 #include "components/omnibox/browser/omnibox_edit_model.h" 57 #include "components/omnibox/browser/omnibox_edit_model.h"
58 #include "components/omnibox/browser/omnibox_view.h" 58 #include "components/omnibox/browser/omnibox_view.h"
59 #include "components/prefs/pref_service.h" 59 #include "components/prefs/pref_service.h"
60 #include "components/search_engines/template_url_service.h" 60 #include "components/search_engines/template_url_service.h"
61 #include "components/strings/grit/components_strings.h"
61 #include "components/url_formatter/url_fixer.h" 62 #include "components/url_formatter/url_fixer.h"
62 #include "content/public/browser/web_contents.h" 63 #include "content/public/browser/web_contents.h"
63 #include "grit/components_strings.h"
64 #include "grit/theme_resources.h" 64 #include "grit/theme_resources.h"
65 #import "ui/base/cocoa/menu_controller.h" 65 #import "ui/base/cocoa/menu_controller.h"
66 #import "ui/base/cocoa/nsview_additions.h" 66 #import "ui/base/cocoa/nsview_additions.h"
67 #include "ui/base/l10n/l10n_util.h" 67 #include "ui/base/l10n/l10n_util.h"
68 #include "ui/base/l10n/l10n_util_mac.h" 68 #include "ui/base/l10n/l10n_util_mac.h"
69 #include "ui/base/material_design/material_design_controller.h" 69 #include "ui/base/material_design/material_design_controller.h"
70 #include "ui/gfx/geometry/rect.h" 70 #include "ui/gfx/geometry/rect.h"
71 #include "ui/gfx/image/image.h" 71 #include "ui/gfx/image/image.h"
72 72
73 using content::OpenURLParams; 73 using content::OpenURLParams;
(...skipping 1112 matching lines...) Expand 10 before | Expand all | Expand 10 after
1186 - (void)hideDropURLsIndicatorInView:(NSView*)view { 1186 - (void)hideDropURLsIndicatorInView:(NSView*)view {
1187 // Do nothing. 1187 // Do nothing.
1188 } 1188 }
1189 1189
1190 // (URLDropTargetController protocol) 1190 // (URLDropTargetController protocol)
1191 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info { 1191 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
1192 return drag_util::IsUnsupportedDropData(profile_, info); 1192 return drag_util::IsUnsupportedDropData(profile_, info);
1193 } 1193 }
1194 1194
1195 @end 1195 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698