chrome/browser/ui/views/dropdown_bar_view.cc - 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/views/dropdown_bar_view.cc

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

Patch Set: rebase, *_standard.rc 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

« no previous file with comments | « chrome/browser/ui/views/download/download_started_animation_views.cc ('k') | chrome/browser/ui/views/edit_search_engine_dialog.cc » ('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) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/views/dropdown_bar_view.h"	5 #include "chrome/browser/ui/views/dropdown_bar_view.h"

6	6

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

8 #include "chrome/browser/ui/view_ids.h"	8 #include "chrome/browser/ui/view_ids.h"

9 #include "chrome/browser/ui/views/frame/browser_view.h"	9 #include "chrome/browser/ui/views/frame/browser_view.h"

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

11 #include "grit/theme_resources_standard.h"	11 #include "grit/theme_resources.h"

12 #include "third_party/skia/include/core/SkCanvas.h"	12 #include "third_party/skia/include/core/SkCanvas.h"

13 #include "third_party/skia/include/core/SkRect.h"	13 #include "third_party/skia/include/core/SkRect.h"

14 #include "ui/base/resource/resource_bundle.h"	14 #include "ui/base/resource/resource_bundle.h"

15 #include "ui/gfx/canvas.h"	15 #include "ui/gfx/canvas.h"

16 #include "ui/gfx/image/image_skia.h"	16 #include "ui/gfx/image/image_skia.h"

17 #include "ui/views/background.h"	17 #include "ui/views/background.h"

18 #include "ui/views/border.h"	18 #include "ui/views/border.h"

19 #include "ui/views/painter.h"	19 #include "ui/views/painter.h"

20 #include "ui/views/widget/widget.h"	20 #include "ui/views/widget/widget.h"

21	21

(...skipping 108 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
130 }	130 }

131	131

132 void DropdownBarView::SetBorder(int left_border_image_id,	132 void DropdownBarView::SetBorder(int left_border_image_id,

133 int middle_border_image_id,	133 int middle_border_image_id,

134 int right_border_image_id) {	134 int right_border_image_id) {

135 int border_image_ids[3] = {left_border_image_id, middle_border_image_id,	135 int border_image_ids[3] = {left_border_image_id, middle_border_image_id,

136 right_border_image_id};	136 right_border_image_id};

137 set_border(views::Border::CreateBorderPainter(	137 set_border(views::Border::CreateBorderPainter(

138 new views::HorizontalPainter(border_image_ids)));	138 new views::HorizontalPainter(border_image_ids)));

139 }	139 }

OLD	NEW