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

Side by Side Diff: chrome/browser/themes/theme_service_browsertest.cc

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months 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
OLDNEW
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"
(...skipping 12 matching lines...) Expand all
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
33 virtual void SetUp() OVERRIDE { 33 virtual void SetUp() override {
34 extensions::ComponentLoader::EnableBackgroundExtensionsForTesting(); 34 extensions::ComponentLoader::EnableBackgroundExtensionsForTesting();
35 ExtensionBrowserTest::SetUp(); 35 ExtensionBrowserTest::SetUp();
36 } 36 }
37 37
38 private: 38 private:
39 DISALLOW_COPY_AND_ASSIGN(ThemeServiceBrowserTest); 39 DISALLOW_COPY_AND_ASSIGN(ThemeServiceBrowserTest);
40 }; 40 };
41 41
42 // Test that the theme is recreated from the extension when the data pack is 42 // Test that the theme is recreated from the extension when the data pack is
43 // unavailable or invalid (such as when the theme pack version is incremented). 43 // unavailable or invalid (such as when the theme pack version is incremented).
(...skipping 29 matching lines...) Expand all
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
OLDNEW
« no previous file with comments | « chrome/browser/themes/theme_service_aurax11.cc ('k') | chrome/browser/themes/theme_service_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698