chrome/browser/ui/views/tab_icon_view.cc - Issue 6204002: Carnitas: Remove chrome/browser/views, update references.

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/tab_icon_view.cc

Issue 6204002: Carnitas: Remove chrome/browser/views, update references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Yay, more syncing Created 9 years, 11 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:

OLD	NEW
1 // Copyright (c) 2010 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/views/tab_icon_view.h"	5 #include "chrome/browser/ui/views/tab_icon_view.h"

6	6

7 #if defined(OS_WIN)	7 #if defined(OS_WIN)

8 #include <windows.h>	8 #include <windows.h>

9 #include <shellapi.h>	9 #include <shellapi.h>

10 #endif	10 #endif

11	11

12 #include "app/resource_bundle.h"	12 #include "app/resource_bundle.h"

13 #include "app/theme_provider.h"	13 #include "app/theme_provider.h"

14 #include "base/file_util.h"	14 #include "base/file_util.h"

15 #include "base/logging.h"	15 #include "base/logging.h"

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

147 }	147 }

148	148

149 if (!rendered)	149 if (!rendered)

150 PaintFavIcon(canvas, *g_default_fav_icon);	150 PaintFavIcon(canvas, *g_default_fav_icon);

151 }	151 }

152	152

153 gfx::Size TabIconView::GetPreferredSize() {	153 gfx::Size TabIconView::GetPreferredSize() {

154 return gfx::Size(kFavIconSize, kFavIconSize);	154 return gfx::Size(kFavIconSize, kFavIconSize);

155 }	155 }

OLD	NEW