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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/bookmarks/bookmark_bar_toolbar_view.h" 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h"
6 6
7 #include "chrome/browser/search/search.h" 7 #include "chrome/browser/search/search.h"
8 #include "chrome/browser/themes/theme_properties.h" 8 #include "chrome/browser/themes/theme_properties.h"
9 #include "chrome/browser/themes/theme_service.h" 9 #include "chrome/browser/themes/theme_service.h"
10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" 10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" 11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
12 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 12 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
13 #import "chrome/browser/ui/cocoa/themed_window.h" 13 #import "chrome/browser/ui/cocoa/themed_window.h"
14 #include "chrome/browser/ui/search/search_ui.h" 14 #include "chrome/browser/ui/search/search_ui.h"
15 #include "skia/ext/skia_utils_mac.h" 15 #include "skia/ext/skia_utils_mac.h"
16 #import "ui/base/cocoa/nsgraphics_context_additions.h" 16 #import "ui/base/cocoa/nsgraphics_context_additions.h"
17 #import "ui/base/cocoa/nsview_additions.h" 17 #import "ui/base/cocoa/nsview_additions.h"
18 #include "ui/base/theme_provider.h" 18 #include "ui/base/theme_provider.h"
19 #include "ui/gfx/canvas_skia_paint.h" 19 #include "ui/gfx/canvas_skia_paint.h"
20 #include "ui/gfx/rect.h" 20 #include "ui/gfx/geometry/rect.h"
21 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" 21 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
22 22
23 @interface BookmarkBarToolbarView (Private) 23 @interface BookmarkBarToolbarView (Private)
24 - (void)drawAsDetachedBubble; 24 - (void)drawAsDetachedBubble;
25 @end 25 @end
26 26
27 @implementation BookmarkBarToolbarView 27 @implementation BookmarkBarToolbarView
28 28
29 - (BOOL)isOpaque { 29 - (BOOL)isOpaque {
30 return [controller_ isInState:BookmarkBar::DETACHED]; 30 return [controller_ isInState:BookmarkBar::DETACHED];
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 strokeColor = [[self strokeColor] blendedColorWithFraction:morph 88 strokeColor = [[self strokeColor] blendedColorWithFraction:morph
89 ofColor:strokeColor]; 89 ofColor:strokeColor];
90 strokeColor = [strokeColor colorWithAlphaComponent:0.5]; 90 strokeColor = [strokeColor colorWithAlphaComponent:0.5];
91 [strokeColor set]; 91 [strokeColor set];
92 NSRect strokeRect = bounds; 92 NSRect strokeRect = bounds;
93 strokeRect.size.height = [self cr_lineWidth]; 93 strokeRect.size.height = [self cr_lineWidth];
94 NSRectFillUsingOperation(strokeRect, NSCompositeSourceOver); 94 NSRectFillUsingOperation(strokeRect, NSCompositeSourceOver);
95 } 95 }
96 96
97 @end // @implementation BookmarkBarToolbarView 97 @end // @implementation BookmarkBarToolbarView
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698