chrome/browser/ui/cocoa/download/download_shelf_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/download/download_shelf_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/cocoa/download/download_item_controller.mm ('k') | chrome/browser/ui/cocoa/download/download_show_all_button.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/download/download_shelf_view.h"	5 #import "chrome/browser/ui/cocoa/download/download_shelf_view.h"

6	6

7 #include "base/memory/scoped_nsobject.h"	7 #include "base/memory/scoped_nsobject.h"

8 #include "chrome/browser/themes/theme_service.h"	8 #include "chrome/browser/themes/theme_service.h"

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

10 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"	10 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"

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

12 #import "chrome/browser/ui/cocoa/view_id_util.h"	12 #import "chrome/browser/ui/cocoa/view_id_util.h"

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

14 #include "grit/theme_resources_standard.h"

15 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"	14 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"

16	15

17 @implementation DownloadShelfView	16 @implementation DownloadShelfView

18	17

19 // For programmatic instantiations in unit tests.	18 // For programmatic instantiations in unit tests.

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

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

22 [self setShowsDivider:NO];	21 [self setShowsDivider:NO];

23 }	22 }

24 return self;	23 return self;

(...skipping 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
82	81

83 - (ViewID)viewID {	82 - (ViewID)viewID {

84 return VIEW_ID_DOWNLOAD_SHELF;	83 return VIEW_ID_DOWNLOAD_SHELF;

85 }	84 }

86	85

87 - (BOOL)isOpaque {	86 - (BOOL)isOpaque {

88 return YES;	87 return YES;

89 }	88 }

90	89

91 @end	90 @end

OLD	NEW