Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Side by Side Diff: chrome/browser/views/tab_icon_view.cc

Issue 24011: chrome_resources take 2 (Closed)
Patch Set: rebase Created 11 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
« no previous file with comments | « chrome/browser/views/status_bubble_views.cc ('k') | chrome/browser/views/tabs/tab_renderer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 <windows.h> 5 #include <windows.h>
6 #include <shellapi.h> 6 #include <shellapi.h>
7 7
8 #include "chrome/browser/views/tab_icon_view.h" 8 #include "chrome/browser/views/tab_icon_view.h"
9 9
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "chrome/app/theme/theme_resources.h" 12 #include "grit/theme_resources.h"
13 #include "chrome/common/gfx/chrome_canvas.h" 13 #include "chrome/common/gfx/chrome_canvas.h"
14 #include "chrome/common/gfx/favicon_size.h" 14 #include "chrome/common/gfx/favicon_size.h"
15 #include "chrome/common/gfx/icon_util.h" 15 #include "chrome/common/gfx/icon_util.h"
16 #include "chrome/common/resource_bundle.h" 16 #include "chrome/common/resource_bundle.h"
17 #include "chrome/browser/tab_contents/tab_contents.h" 17 #include "chrome/browser/tab_contents/tab_contents.h"
18 #include "chrome/app/chrome_dll_resource.h" 18 #include "chrome/app/chrome_dll_resource.h"
19 19
20 static bool g_initialized = false; 20 static bool g_initialized = false;
21 static SkBitmap* g_default_fav_icon = NULL; 21 static SkBitmap* g_default_fav_icon = NULL;
22 static SkBitmap* g_throbber_frames = NULL; 22 static SkBitmap* g_throbber_frames = NULL;
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 } 140 }
141 141
142 if (!rendered) 142 if (!rendered)
143 PaintFavIcon(canvas, *g_default_fav_icon); 143 PaintFavIcon(canvas, *g_default_fav_icon);
144 } 144 }
145 145
146 gfx::Size TabIconView::GetPreferredSize() { 146 gfx::Size TabIconView::GetPreferredSize() {
147 return gfx::Size(kFavIconSize, kFavIconSize); 147 return gfx::Size(kFavIconSize, kFavIconSize);
148 } 148 }
149 149
OLDNEW
« no previous file with comments | « chrome/browser/views/status_bubble_views.cc ('k') | chrome/browser/views/tabs/tab_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698