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

Side by Side Diff: chrome/browser/views/frame/glass_browser_frame_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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/frame/glass_browser_frame_view.h" 5 #include "chrome/browser/views/frame/glass_browser_frame_view.h"
6 6
7 #include "app/gfx/canvas.h" 7 #include "app/gfx/canvas.h"
8 #include "app/gfx/icon_util.h"
9 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
10 #include "app/theme_provider.h" 9 #include "app/theme_provider.h"
11 #include "chrome/app/chrome_dll_resource.h" 10 #include "chrome/app/chrome_dll_resource.h"
12 #include "chrome/browser/browser_theme_provider.h" 11 #include "chrome/browser/browser_theme_provider.h"
13 #include "chrome/browser/views/frame/browser_view.h" 12 #include "chrome/browser/views/frame/browser_view.h"
14 #include "chrome/browser/views/tabs/side_tab_strip.h" 13 #include "chrome/browser/views/tabs/side_tab_strip.h"
15 #include "chrome/browser/views/tabs/tab_strip.h" 14 #include "chrome/browser/views/tabs/tab_strip.h"
15 #include "gfx/icon_util.h"
16 #include "grit/app_resources.h" 16 #include "grit/app_resources.h"
17 #include "grit/theme_resources.h" 17 #include "grit/theme_resources.h"
18 #include "views/window/client_view.h" 18 #include "views/window/client_view.h"
19 #include "views/window/window_resources.h" 19 #include "views/window/window_resources.h"
20 20
21 // static 21 // static
22 SkBitmap* GlassBrowserFrameView::distributor_logo_ = NULL; 22 SkBitmap* GlassBrowserFrameView::distributor_logo_ = NULL;
23 HICON GlassBrowserFrameView::throbber_icons_[ 23 HICON GlassBrowserFrameView::throbber_icons_[
24 GlassBrowserFrameView::kThrobberIconCount]; 24 GlassBrowserFrameView::kThrobberIconCount];
25 25
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 static bool initialized = false; 481 static bool initialized = false;
482 if (!initialized) { 482 if (!initialized) {
483 #if defined(GOOGLE_CHROME_BUILD) 483 #if defined(GOOGLE_CHROME_BUILD)
484 distributor_logo_ = ResourceBundle::GetSharedInstance(). 484 distributor_logo_ = ResourceBundle::GetSharedInstance().
485 GetBitmapNamed(IDR_DISTRIBUTOR_LOGO); 485 GetBitmapNamed(IDR_DISTRIBUTOR_LOGO);
486 #endif 486 #endif
487 487
488 initialized = true; 488 initialized = true;
489 } 489 }
490 } 490 }
OLDNEW
« no previous file with comments | « chrome/browser/task_manager_resource_providers.cc ('k') | chrome/browser/views/tab_icon_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698