| OLD | NEW |
| 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/nsview_additions.h" | 13 #import "chrome/browser/ui/cocoa/nsview_additions.h" |
| 14 #import "chrome/browser/ui/cocoa/themed_window.h" | 14 #import "chrome/browser/ui/cocoa/themed_window.h" |
| 15 #include "chrome/browser/ui/ntp_background_util.h" | 15 #include "chrome/browser/ui/ntp_background_util.h" |
| 16 #include "chrome/browser/ui/search/search_ui.h" | 16 #include "chrome/browser/ui/search/search_ui.h" |
| 17 #include "grit/theme_resources.h" | 17 #include "grit/theme_resources.h" |
| 18 #include "skia/ext/skia_utils_mac.h" | 18 #include "skia/ext/skia_utils_mac.h" |
| 19 #import "ui/base/cocoa/nsgraphics_context_additions.h" | 19 #import "ui/base/cocoa/nsgraphics_context_additions.h" |
| 20 #include "ui/base/theme_provider.h" | 20 #include "ui/base/theme_provider.h" |
| 21 #include "ui/gfx/canvas_skia_paint.h" | 21 #include "ui/gfx/canvas_skia_paint.h" |
| 22 #include "ui/gfx/rect.h" | 22 #include "ui/gfx/rect.h" |
| 23 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" | 23 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" |
| 24 | 24 |
| 25 const CGFloat kBorderRadius = 3.0; | |
| 26 | |
| 27 @interface BookmarkBarToolbarView (Private) | 25 @interface BookmarkBarToolbarView (Private) |
| 28 - (void)drawAsDetachedBubble; | 26 - (void)drawAsDetachedBubble; |
| 29 @end | 27 @end |
| 30 | 28 |
| 31 @implementation BookmarkBarToolbarView | 29 @implementation BookmarkBarToolbarView |
| 32 | 30 |
| 33 - (BOOL)isOpaque { | 31 - (BOOL)isOpaque { |
| 34 return [controller_ isInState:BookmarkBar::DETACHED]; | 32 return [controller_ isInState:BookmarkBar::DETACHED]; |
| 35 } | 33 } |
| 36 | 34 |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 strokeColor = [[self strokeColor] blendedColorWithFraction:morph | 89 strokeColor = [[self strokeColor] blendedColorWithFraction:morph |
| 92 ofColor:strokeColor]; | 90 ofColor:strokeColor]; |
| 93 strokeColor = [strokeColor colorWithAlphaComponent:0.5]; | 91 strokeColor = [strokeColor colorWithAlphaComponent:0.5]; |
| 94 [strokeColor set]; | 92 [strokeColor set]; |
| 95 NSRect strokeRect = bounds; | 93 NSRect strokeRect = bounds; |
| 96 strokeRect.size.height = [self cr_lineWidth]; | 94 strokeRect.size.height = [self cr_lineWidth]; |
| 97 NSRectFillUsingOperation(strokeRect, NSCompositeSourceOver); | 95 NSRectFillUsingOperation(strokeRect, NSCompositeSourceOver); |
| 98 } | 96 } |
| 99 | 97 |
| 100 @end // @implementation BookmarkBarToolbarView | 98 @end // @implementation BookmarkBarToolbarView |
| OLD | NEW |