| OLD | NEW | 
|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/themes/theme_service.h" | 5 #include "chrome/browser/themes/theme_service.h" | 
| 6 | 6 | 
| 7 #include "base/macros.h" | 7 #include "base/macros.h" | 
| 8 #include "base/prefs/pref_service.h" |  | 
| 9 #include "chrome/browser/extensions/component_loader.h" | 8 #include "chrome/browser/extensions/component_loader.h" | 
| 10 #include "chrome/browser/extensions/extension_browsertest.h" | 9 #include "chrome/browser/extensions/extension_browsertest.h" | 
| 11 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" | 
| 12 #include "chrome/browser/themes/theme_properties.h" | 11 #include "chrome/browser/themes/theme_properties.h" | 
| 13 #include "chrome/browser/themes/theme_service_factory.h" | 12 #include "chrome/browser/themes/theme_service_factory.h" | 
| 14 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" | 
| 15 #include "chrome/common/pref_names.h" | 14 #include "chrome/common/pref_names.h" | 
|  | 15 #include "components/prefs/pref_service.h" | 
| 16 | 16 | 
| 17 namespace { | 17 namespace { | 
| 18 | 18 | 
| 19 // The toolbar color specified in the theme. | 19 // The toolbar color specified in the theme. | 
| 20 const SkColor kThemeToolbarColor = 0xFFCFDDC0; | 20 const SkColor kThemeToolbarColor = 0xFFCFDDC0; | 
| 21 | 21 | 
| 22 bool UsingCustomTheme(const ThemeService& theme_service) { | 22 bool UsingCustomTheme(const ThemeService& theme_service) { | 
| 23   return !theme_service.UsingSystemTheme() && | 23   return !theme_service.UsingSystemTheme() && | 
| 24          !theme_service.UsingDefaultTheme(); | 24          !theme_service.UsingDefaultTheme(); | 
| 25 } | 25 } | 
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 77   ThemeService* theme_service = ThemeServiceFactory::GetForProfile( | 77   ThemeService* theme_service = ThemeServiceFactory::GetForProfile( | 
| 78       browser()->profile()); | 78       browser()->profile()); | 
| 79   const ui::ThemeProvider& theme_provider = | 79   const ui::ThemeProvider& theme_provider = | 
| 80       ThemeService::GetThemeProviderForProfile(browser()->profile()); | 80       ThemeService::GetThemeProviderForProfile(browser()->profile()); | 
| 81   EXPECT_TRUE(UsingCustomTheme(*theme_service)); | 81   EXPECT_TRUE(UsingCustomTheme(*theme_service)); | 
| 82   EXPECT_EQ(kThemeToolbarColor, | 82   EXPECT_EQ(kThemeToolbarColor, | 
| 83             theme_provider.GetColor(ThemeProperties::COLOR_TOOLBAR)); | 83             theme_provider.GetColor(ThemeProperties::COLOR_TOOLBAR)); | 
| 84 } | 84 } | 
| 85 | 85 | 
| 86 }  // namespace | 86 }  // namespace | 
| OLD | NEW | 
|---|