chrome/browser/ui/cocoa/background_gradient_view.mm - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

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/background_gradient_view.mm

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge Created 8 years, 5 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 | Annotate | Revision Log

« chrome/browser/resources_util.cc ('K') | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm » ('j') | no next file with comments »

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 #include "chrome/browser/ui/cocoa/background_gradient_view.h"	5 #include "chrome/browser/ui/cocoa/background_gradient_view.h"

6	6

7 #import "chrome/browser/themes/theme_service.h"	7 #import "chrome/browser/themes/theme_service.h"

8 #import "chrome/browser/ui/cocoa/nsview_additions.h"	8 #import "chrome/browser/ui/cocoa/nsview_additions.h"

9 #import "chrome/browser/ui/cocoa/themed_window.h"	9 #import "chrome/browser/ui/cocoa/themed_window.h"

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

11 #include "grit/theme_resources_standard.h"

12	11

13 @interface BackgroundGradientView (Private)	12 @interface BackgroundGradientView (Private)

14 - (NSColor*)backgroundImageColor;	13 - (NSColor*)backgroundImageColor;

15 @end	14 @end

16	15

17 @implementation BackgroundGradientView	16 @implementation BackgroundGradientView

18 @synthesize showsDivider = showsDivider_;	17 @synthesize showsDivider = showsDivider_;

19	18

20 - (id)initWithFrame:(NSRect)frameRect {	19 - (id)initWithFrame:(NSRect)frameRect {

21 if ((self = [super initWithFrame:frameRect])) {	20 if ((self = [super initWithFrame:frameRect])) {

(...skipping 59 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
81 NSColor* color = themeProvider->GetNSImageColorNamed(	80 NSColor* color = themeProvider->GetNSImageColorNamed(

82 IDR_THEME_TOOLBAR_INACTIVE, true);	81 IDR_THEME_TOOLBAR_INACTIVE, true);

83 if (color)	82 if (color)

84 return color;	83 return color;

85 }	84 }

86	85

87 return themeProvider->GetNSImageColorNamed(IDR_THEME_TOOLBAR, true);	86 return themeProvider->GetNSImageColorNamed(IDR_THEME_TOOLBAR, true);

88 }	87 }

89	88

90 @end	89 @end

OLD	NEW