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

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

Issue 823133004: Cleanup: Update the path to gfx rect headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rect_f.h Created 5 years, 11 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/grit/generated_resources.h" 51 #include "chrome/grit/generated_resources.h"
52 #include "components/metrics/proto/omnibox_event.pb.h" 52 #include "components/metrics/proto/omnibox_event.pb.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/image/image.h" 62 #include "ui/gfx/image/image.h"
62 #include "ui/gfx/rect.h"
63 63
64 using content::OpenURLParams; 64 using content::OpenURLParams;
65 using content::Referrer; 65 using content::Referrer;
66 using content::WebContents; 66 using content::WebContents;
67 67
68 namespace { 68 namespace {
69 69
70 // Height of the toolbar in pixels when the bookmark bar is closed. 70 // Height of the toolbar in pixels when the bookmark bar is closed.
71 const CGFloat kBaseToolbarHeightNormal = 35.0; 71 const CGFloat kBaseToolbarHeightNormal = 35.0;
72 72
(...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after
865 - (void)hideDropURLsIndicatorInView:(NSView*)view { 865 - (void)hideDropURLsIndicatorInView:(NSView*)view {
866 // Do nothing. 866 // Do nothing.
867 } 867 }
868 868
869 // (URLDropTargetController protocol) 869 // (URLDropTargetController protocol)
870 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info { 870 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
871 return drag_util::IsUnsupportedDropData(profile_, info); 871 return drag_util::IsUnsupportedDropData(profile_, info);
872 } 872 }
873 873
874 @end 874 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/panels/panel_utils_cocoa.h ('k') | chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698