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

Side by Side Diff: chrome/browser/views/frame/glass_browser_frame_view.cc

Issue 4710001: Split out command IDs from chrome_dll_resource.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 1 month 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/resource_bundle.h" 7 #include "app/resource_bundle.h"
8 #include "app/theme_provider.h" 8 #include "app/theme_provider.h"
9 #include "chrome/app/chrome_dll_resource.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/themes/browser_theme_provider.h" 10 #include "chrome/browser/themes/browser_theme_provider.h"
11 #include "chrome/browser/views/frame/browser_view.h" 11 #include "chrome/browser/views/frame/browser_view.h"
12 #include "chrome/browser/views/tabs/side_tab_strip.h" 12 #include "chrome/browser/views/tabs/side_tab_strip.h"
13 #include "chrome/browser/views/tabs/tab.h" 13 #include "chrome/browser/views/tabs/tab.h"
14 #include "chrome/browser/views/tabs/tab_strip.h" 14 #include "chrome/browser/views/tabs/tab_strip.h"
15 #include "gfx/canvas_skia.h" 15 #include "gfx/canvas_skia.h"
16 #include "gfx/icon_util.h" 16 #include "gfx/icon_util.h"
17 #include "grit/app_resources.h" 17 #include "grit/app_resources.h"
18 #include "grit/theme_resources.h" 18 #include "grit/theme_resources.h"
19 #include "views/window/client_view.h" 19 #include "views/window/client_view.h"
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 static bool initialized = false; 501 static bool initialized = false;
502 if (!initialized) { 502 if (!initialized) {
503 ResourceBundle &rb = ResourceBundle::GetSharedInstance(); 503 ResourceBundle &rb = ResourceBundle::GetSharedInstance();
504 for (int i = 0; i < kThrobberIconCount; ++i) { 504 for (int i = 0; i < kThrobberIconCount; ++i) {
505 throbber_icons_[i] = rb.LoadThemeIcon(IDI_THROBBER_01 + i); 505 throbber_icons_[i] = rb.LoadThemeIcon(IDI_THROBBER_01 + i);
506 DCHECK(throbber_icons_[i]); 506 DCHECK(throbber_icons_[i]);
507 } 507 }
508 initialized = true; 508 initialized = true;
509 } 509 }
510 } 510 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698