| 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/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "chrome/browser/extensions/component_loader.h" | 8 #include "chrome/browser/extensions/component_loader.h" |
| 9 #include "chrome/browser/extensions/extension_browsertest.h" | 9 #include "chrome/browser/extensions/extension_browsertest.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| 11 #include "chrome/browser/themes/theme_properties.h" | 11 #include "chrome/browser/themes/theme_properties.h" |
| 12 #include "chrome/browser/themes/theme_service_factory.h" | 12 #include "chrome/browser/themes/theme_service_factory.h" |
| 13 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
| 14 #include "chrome/common/pref_names.h" | 14 #include "chrome/common/pref_names.h" |
| 15 | 15 |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 // The toolbar color specified in the theme. | 18 // The toolbar color specified in the theme. |
| 19 const SkColor kThemeToolbarColor = 0xFFCFDDC0; | 19 const SkColor kThemeToolbarColor = 0xFFCFDDC0; |
| 20 | 20 |
| 21 bool UsingCustomTheme(const ThemeService& theme_service) { | 21 bool UsingCustomTheme(const ThemeService& theme_service) { |
| 22 return !theme_service.UsingNativeTheme() && | 22 return !theme_service.UsingSystemTheme() && |
| 23 !theme_service.UsingDefaultTheme(); | 23 !theme_service.UsingDefaultTheme(); |
| 24 } | 24 } |
| 25 | 25 |
| 26 class ThemeServiceBrowserTest : public ExtensionBrowserTest { | 26 class ThemeServiceBrowserTest : public ExtensionBrowserTest { |
| 27 public: | 27 public: |
| 28 ThemeServiceBrowserTest() { | 28 ThemeServiceBrowserTest() { |
| 29 } | 29 } |
| 30 virtual ~ThemeServiceBrowserTest() { | 30 virtual ~ThemeServiceBrowserTest() { |
| 31 } | 31 } |
| 32 | 32 |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 | 73 |
| 74 IN_PROC_BROWSER_TEST_F(ThemeServiceBrowserTest, ThemeDataPackInvalid) { | 74 IN_PROC_BROWSER_TEST_F(ThemeServiceBrowserTest, ThemeDataPackInvalid) { |
| 75 ThemeService* theme_service = ThemeServiceFactory::GetForProfile( | 75 ThemeService* theme_service = ThemeServiceFactory::GetForProfile( |
| 76 browser()->profile()); | 76 browser()->profile()); |
| 77 EXPECT_TRUE(UsingCustomTheme(*theme_service)); | 77 EXPECT_TRUE(UsingCustomTheme(*theme_service)); |
| 78 EXPECT_EQ(kThemeToolbarColor, theme_service->GetColor( | 78 EXPECT_EQ(kThemeToolbarColor, theme_service->GetColor( |
| 79 ThemeProperties::COLOR_TOOLBAR)); | 79 ThemeProperties::COLOR_TOOLBAR)); |
| 80 } | 80 } |
| 81 | 81 |
| 82 } // namespace | 82 } // namespace |
| OLD | NEW |