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

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

Issue 915002: Create a toplevel gfx/ dir and seed it with icon_util.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 9 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
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 "chrome/browser/views/tab_icon_view.h" 5 #include "chrome/browser/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/gfx/canvas.h" 12 #include "app/gfx/canvas.h"
13 #include "app/gfx/favicon_size.h" 13 #include "app/gfx/favicon_size.h"
14 #include "app/resource_bundle.h" 14 #include "app/resource_bundle.h"
15 #include "base/file_util.h" 15 #include "base/file_util.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/path_service.h" 17 #include "base/path_service.h"
18 #include "chrome/app/chrome_dll_resource.h" 18 #include "chrome/app/chrome_dll_resource.h"
19 #include "chrome/browser/tab_contents/tab_contents.h" 19 #include "chrome/browser/tab_contents/tab_contents.h"
20 #include "chrome/common/chrome_constants.h" 20 #include "chrome/common/chrome_constants.h"
21 #include "grit/app_resources.h" 21 #include "grit/app_resources.h"
22 #include "grit/theme_resources.h" 22 #include "grit/theme_resources.h"
23 23
24 #if defined(OS_WIN) 24 #if defined(OS_WIN)
25 #include "app/gfx/icon_util.h" 25 #include "gfx/icon_util.h"
26 #endif 26 #endif
27 27
28 static bool g_initialized = false; 28 static bool g_initialized = false;
29 static SkBitmap* g_default_fav_icon = NULL; 29 static SkBitmap* g_default_fav_icon = NULL;
30 static SkBitmap* g_throbber_frames = NULL; 30 static SkBitmap* g_throbber_frames = NULL;
31 static SkBitmap* g_throbber_frames_light = NULL; 31 static SkBitmap* g_throbber_frames_light = NULL;
32 static int g_throbber_frame_count; 32 static int g_throbber_frame_count;
33 33
34 // static 34 // static
35 void TabIconView::InitializeIfNeeded() { 35 void TabIconView::InitializeIfNeeded() {
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 } 153 }
154 } 154 }
155 155
156 if (!rendered) 156 if (!rendered)
157 PaintFavIcon(canvas, *g_default_fav_icon); 157 PaintFavIcon(canvas, *g_default_fav_icon);
158 } 158 }
159 159
160 gfx::Size TabIconView::GetPreferredSize() { 160 gfx::Size TabIconView::GetPreferredSize() {
161 return gfx::Size(kFavIconSize, kFavIconSize); 161 return gfx::Size(kFavIconSize, kFavIconSize);
162 } 162 }
OLDNEW
« no previous file with comments | « chrome/browser/views/frame/glass_browser_frame_view.cc ('k') | chrome/browser/web_applications/web_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698