OLD | NEW |
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/frame/glass_browser_frame_view.h" | 5 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" |
6 | 6 |
7 #include "app/resource_bundle.h" | |
8 #include "chrome/app/chrome_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
9 #include "chrome/app/chrome_dll_resource.h" | 8 #include "chrome/app/chrome_dll_resource.h" |
10 #include "chrome/browser/themes/browser_theme_provider.h" | 9 #include "chrome/browser/themes/browser_theme_provider.h" |
11 #include "chrome/browser/ui/views/frame/browser_view.h" | 10 #include "chrome/browser/ui/views/frame/browser_view.h" |
12 #include "chrome/browser/ui/views/tabs/side_tab_strip.h" | 11 #include "chrome/browser/ui/views/tabs/side_tab_strip.h" |
13 #include "chrome/browser/ui/views/tabs/tab.h" | 12 #include "chrome/browser/ui/views/tabs/tab.h" |
14 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 13 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
15 #include "gfx/canvas_skia.h" | 14 #include "gfx/canvas_skia.h" |
16 #include "gfx/icon_util.h" | 15 #include "gfx/icon_util.h" |
17 #include "grit/app_resources.h" | 16 #include "grit/app_resources.h" |
18 #include "grit/theme_resources.h" | 17 #include "grit/theme_resources.h" |
| 18 #include "ui/base/resource/resource_bundle.h" |
19 #include "ui/base/theme_provider.h" | 19 #include "ui/base/theme_provider.h" |
20 #include "views/window/client_view.h" | 20 #include "views/window/client_view.h" |
21 #include "views/window/window_resources.h" | 21 #include "views/window/window_resources.h" |
22 | 22 |
23 HICON GlassBrowserFrameView::throbber_icons_[ | 23 HICON GlassBrowserFrameView::throbber_icons_[ |
24 GlassBrowserFrameView::kThrobberIconCount]; | 24 GlassBrowserFrameView::kThrobberIconCount]; |
25 | 25 |
26 namespace { | 26 namespace { |
27 // There are 3 px of client edge drawn inside the outer frame borders. | 27 // There are 3 px of client edge drawn inside the outer frame borders. |
28 const int kNonClientBorderThickness = 3; | 28 const int kNonClientBorderThickness = 3; |
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
503 static bool initialized = false; | 503 static bool initialized = false; |
504 if (!initialized) { | 504 if (!initialized) { |
505 ResourceBundle &rb = ResourceBundle::GetSharedInstance(); | 505 ResourceBundle &rb = ResourceBundle::GetSharedInstance(); |
506 for (int i = 0; i < kThrobberIconCount; ++i) { | 506 for (int i = 0; i < kThrobberIconCount; ++i) { |
507 throbber_icons_[i] = rb.LoadThemeIcon(IDI_THROBBER_01 + i); | 507 throbber_icons_[i] = rb.LoadThemeIcon(IDI_THROBBER_01 + i); |
508 DCHECK(throbber_icons_[i]); | 508 DCHECK(throbber_icons_[i]); |
509 } | 509 } |
510 initialized = true; | 510 initialized = true; |
511 } | 511 } |
512 } | 512 } |
OLD | NEW |