| 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 "base/command_line.h" | 7 #include "base/command_line.h" | 
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" | 
| 9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" | 
| 10 #include "chrome/app/chrome_dll_resource.h" | 10 #include "chrome/app/chrome_dll_resource.h" | 
| 11 #include "chrome/browser/prefs/pref_service.h" | 11 #include "chrome/browser/prefs/pref_service.h" | 
| 12 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" | 
| 13 #include "chrome/browser/themes/theme_service.h" | 13 #include "chrome/browser/themes/theme_service.h" | 
| 14 #include "chrome/browser/ui/views/frame/browser_view.h" | 14 #include "chrome/browser/ui/views/frame/browser_view.h" | 
| 15 #include "chrome/browser/ui/views/profile_menu_button.h" | 15 #include "chrome/browser/ui/views/profile_menu_button.h" | 
| 16 #include "chrome/browser/ui/views/profile_menu_model.h" | 16 #include "chrome/browser/ui/views/profile_menu_model.h" | 
| 17 #include "chrome/browser/ui/views/profile_tag_view.h" | 17 #include "chrome/browser/ui/views/profile_tag_view.h" | 
| 18 #include "chrome/browser/ui/views/tabs/side_tab_strip.h" | 18 #include "chrome/browser/ui/views/tabs/side_tab_strip.h" | 
| 19 #include "chrome/browser/ui/views/tabs/tab.h" | 19 #include "chrome/browser/ui/views/tabs/tab.h" | 
| 20 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 20 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 
| 21 #include "chrome/common/chrome_switches.h" | 21 #include "chrome/common/chrome_switches.h" | 
| 22 #include "chrome/common/pref_names.h" | 22 #include "chrome/common/pref_names.h" | 
| 23 #include "content/common/notification_service.h" | 23 #include "content/common/notification_service.h" | 
| 24 #include "grit/app_resources.h" | 24 #include "grit/app_resources.h" | 
| 25 #include "grit/theme_resources.h" | 25 #include "grit/theme_resources.h" | 
|  | 26 #include "grit/theme_resources_standard.h" | 
| 26 #include "ui/base/resource/resource_bundle.h" | 27 #include "ui/base/resource/resource_bundle.h" | 
| 27 #include "ui/base/theme_provider.h" | 28 #include "ui/base/theme_provider.h" | 
| 28 #include "ui/gfx/canvas_skia.h" | 29 #include "ui/gfx/canvas_skia.h" | 
| 29 #include "ui/gfx/icon_util.h" | 30 #include "ui/gfx/icon_util.h" | 
| 30 #include "views/window/client_view.h" | 31 #include "views/window/client_view.h" | 
| 31 #include "views/window/window_resources.h" | 32 #include "views/window/window_resources.h" | 
| 32 | 33 | 
| 33 HICON GlassBrowserFrameView::throbber_icons_[ | 34 HICON GlassBrowserFrameView::throbber_icons_[ | 
| 34     GlassBrowserFrameView::kThrobberIconCount]; | 35     GlassBrowserFrameView::kThrobberIconCount]; | 
| 35 | 36 | 
| (...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 622   static bool initialized = false; | 623   static bool initialized = false; | 
| 623   if (!initialized) { | 624   if (!initialized) { | 
| 624     ResourceBundle &rb = ResourceBundle::GetSharedInstance(); | 625     ResourceBundle &rb = ResourceBundle::GetSharedInstance(); | 
| 625     for (int i = 0; i < kThrobberIconCount; ++i) { | 626     for (int i = 0; i < kThrobberIconCount; ++i) { | 
| 626       throbber_icons_[i] = rb.LoadThemeIcon(IDI_THROBBER_01 + i); | 627       throbber_icons_[i] = rb.LoadThemeIcon(IDI_THROBBER_01 + i); | 
| 627       DCHECK(throbber_icons_[i]); | 628       DCHECK(throbber_icons_[i]); | 
| 628     } | 629     } | 
| 629     initialized = true; | 630     initialized = true; | 
| 630   } | 631   } | 
| 631 } | 632 } | 
| OLD | NEW | 
|---|