chrome/browser/ui/touch/tabs/touch_tab.cc - Issue 6312156: Change includes of gfx/* to ui/gfx/*

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/touch/tabs/touch_tab.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 10 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/touch/tabs/touch_tab.h ('k') | chrome/browser/ui/touch/tabs/touch_tab_strip.cc » ('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/touch/tabs/touch_tab.h"	5 #include "chrome/browser/ui/touch/tabs/touch_tab.h"

6	6

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

8 #include "gfx/canvas_skia.h"

9 #include "gfx/favicon_size.h"

10 #include "gfx/path.h"

11 #include "gfx/skbitmap_operations.h"

12 #include "grit/app_resources.h"	8 #include "grit/app_resources.h"

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

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

	11 #include "ui/gfx/canvas_skia.h"

	12 #include "ui/gfx/favicon_size.h"

	13 #include "ui/gfx/path.h"

	14 #include "ui/gfx/skbitmap_operations.h"

15	15

16 static const int kLeftPadding = 16;	16 static const int kLeftPadding = 16;

17 static const int kRightPadding = 15;	17 static const int kRightPadding = 15;

18 static const int kDropShadowHeight = 2;	18 static const int kDropShadowHeight = 2;

19 static const int kTouchFaviconSize = 32;	19 static const int kTouchFaviconSize = 32;

20	20

21 TouchTab::TouchTabImage TouchTab::tab_alpha = {0};	21 TouchTab::TouchTabImage TouchTab::tab_alpha = {0};

22 TouchTab::TouchTabImage TouchTab::tab_active = {0};	22 TouchTab::TouchTabImage TouchTab::tab_active = {0};

23 TouchTab::TouchTabImage TouchTab::tab_inactive = {0};	23 TouchTab::TouchTabImage TouchTab::tab_inactive = {0};

24	24

(...skipping 201 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
226 tab_active.image_r = rb.GetBitmapNamed(IDR_TAB_ACTIVE_RIGHT);	226 tab_active.image_r = rb.GetBitmapNamed(IDR_TAB_ACTIVE_RIGHT);

227 tab_active.l_width = tab_active.image_l->width();	227 tab_active.l_width = tab_active.image_l->width();

228 tab_active.r_width = tab_active.image_r->width();	228 tab_active.r_width = tab_active.image_r->width();

229	229

230 tab_inactive.image_l = rb.GetBitmapNamed(IDR_TAB_INACTIVE_LEFT);	230 tab_inactive.image_l = rb.GetBitmapNamed(IDR_TAB_INACTIVE_LEFT);

231 tab_inactive.image_c = rb.GetBitmapNamed(IDR_TAB_INACTIVE_CENTER);	231 tab_inactive.image_c = rb.GetBitmapNamed(IDR_TAB_INACTIVE_CENTER);

232 tab_inactive.image_r = rb.GetBitmapNamed(IDR_TAB_INACTIVE_RIGHT);	232 tab_inactive.image_r = rb.GetBitmapNamed(IDR_TAB_INACTIVE_RIGHT);

233 tab_inactive.l_width = tab_inactive.image_l->width();	233 tab_inactive.l_width = tab_inactive.image_l->width();

234 tab_inactive.r_width = tab_inactive.image_r->width();	234 tab_inactive.r_width = tab_inactive.image_r->width();

235 }	235 }

OLD	NEW