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

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

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/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"
13 #include "base/file_util.h" 12 #include "base/file_util.h"
14 #include "base/logging.h" 13 #include "base/logging.h"
15 #include "chrome/app/chrome_command_ids.h" 14 #include "chrome/app/chrome_command_ids.h"
16 #include "gfx/canvas.h" 15 #include "gfx/canvas.h"
17 #include "gfx/favicon_size.h" 16 #include "gfx/favicon_size.h"
18 #include "grit/app_resources.h" 17 #include "grit/app_resources.h"
19 #include "grit/theme_resources.h" 18 #include "grit/theme_resources.h"
19 #include "ui/base/resource/resource_bundle.h"
20 #include "ui/base/theme_provider.h" 20 #include "ui/base/theme_provider.h"
21 21
22 #if defined(OS_WIN) 22 #if defined(OS_WIN)
23 #include "chrome/browser/app_icon_win.h" 23 #include "chrome/browser/app_icon_win.h"
24 #include "gfx/icon_util.h" 24 #include "gfx/icon_util.h"
25 #endif 25 #endif
26 26
27 static bool g_initialized = false; 27 static bool g_initialized = false;
28 static SkBitmap* g_default_fav_icon = NULL; 28 static SkBitmap* g_default_fav_icon = NULL;
29 29
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc ('k') | chrome/browser/ui/views/tabs/base_tab.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698