chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm - Issue 12335141: Move c/b/ui/search/search.* to c/b/instant/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm

Issue 12335141: Move c/b/ui/search/search.* to c/b/instant/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 7 years, 9 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/bookmarks/bookmark_bar_controller.mm ('k') | chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/instant/search.h"

7 #include "chrome/browser/themes/theme_properties.h"	8 #include "chrome/browser/themes/theme_properties.h"

8 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"	9 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"

9 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"	10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"

10 #import "chrome/browser/ui/cocoa/browser_window_controller.h"	11 #import "chrome/browser/ui/cocoa/browser_window_controller.h"

11 #import "chrome/browser/ui/cocoa/nsview_additions.h"	12 #import "chrome/browser/ui/cocoa/nsview_additions.h"

12 #import "chrome/browser/ui/cocoa/themed_window.h"	13 #import "chrome/browser/ui/cocoa/themed_window.h"

13 #include "chrome/browser/ui/ntp_background_util.h"	14 #include "chrome/browser/ui/ntp_background_util.h"

14 #include "chrome/browser/ui/search/search.h"

15 #include "chrome/browser/ui/search/search_ui.h"	15 #include "chrome/browser/ui/search/search_ui.h"

16 #include "grit/theme_resources.h"	16 #include "grit/theme_resources.h"

17 #include "skia/ext/skia_utils_mac.h"	17 #include "skia/ext/skia_utils_mac.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/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 const CGFloat kBorderRadius = 3.0;	23 const CGFloat kBorderRadius = 3.0;

24	24

(...skipping 155 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
180 chrome::search::GetDetachedBookmarkBarSeparatorColor(themeProvider));	180 chrome::search::GetDetachedBookmarkBarSeparatorColor(themeProvider));

181 strokeColor = [[self strokeColor] blendedColorWithFraction:morph	181 strokeColor = [[self strokeColor] blendedColorWithFraction:morph

182 ofColor:strokeColor];	182 ofColor:strokeColor];

183 [strokeColor set];	183 [strokeColor set];

184 NSRect strokeRect = bounds;	184 NSRect strokeRect = bounds;

185 strokeRect.size.height = 1;	185 strokeRect.size.height = 1;

186 NSRectFillUsingOperation(strokeRect, NSCompositeSourceOver);	186 NSRectFillUsingOperation(strokeRect, NSCompositeSourceOver);

187 }	187 }

188	188

189 @end // @implementation BookmarkBarToolbarView	189 @end // @implementation BookmarkBarToolbarView

OLD	NEW