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

Side by Side Diff: chrome/browser/themes/theme_service_unittest.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "chrome/browser/chrome_notification_types.h" 9 #include "chrome/browser/chrome_notification_types.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 EXPECT_TRUE(registry_->GetExtensionById(extension1_id, 236 EXPECT_TRUE(registry_->GetExtensionById(extension1_id,
237 ExtensionRegistry::DISABLED)); 237 ExtensionRegistry::DISABLED));
238 } 238 }
239 239
240 #if defined(ENABLE_MANAGED_USERS) 240 #if defined(ENABLE_MANAGED_USERS)
241 class ThemeServiceSupervisedUserTest : public ThemeServiceTest { 241 class ThemeServiceSupervisedUserTest : public ThemeServiceTest {
242 public: 242 public:
243 ThemeServiceSupervisedUserTest() {} 243 ThemeServiceSupervisedUserTest() {}
244 virtual ~ThemeServiceSupervisedUserTest() {} 244 virtual ~ThemeServiceSupervisedUserTest() {}
245 245
246 virtual void SetUp() OVERRIDE { 246 virtual void SetUp() override {
247 is_supervised_ = true; 247 is_supervised_ = true;
248 ThemeServiceTest::SetUp(); 248 ThemeServiceTest::SetUp();
249 } 249 }
250 }; 250 };
251 251
252 // Checks that supervised users have their own default theme. 252 // Checks that supervised users have their own default theme.
253 TEST_F(ThemeServiceSupervisedUserTest, 253 TEST_F(ThemeServiceSupervisedUserTest,
254 SupervisedUserThemeReplacesDefaultTheme) { 254 SupervisedUserThemeReplacesDefaultTheme) {
255 ThemeService* theme_service = 255 ThemeService* theme_service =
256 ThemeServiceFactory::GetForProfile(profile_.get()); 256 ThemeServiceFactory::GetForProfile(profile_.get());
(...skipping 14 matching lines...) Expand all
271 theme_service->UseDefaultTheme(); 271 theme_service->UseDefaultTheme();
272 EXPECT_TRUE(theme_service->UsingDefaultTheme()); 272 EXPECT_TRUE(theme_service->UsingDefaultTheme());
273 EXPECT_TRUE(get_theme_supplier(theme_service)); 273 EXPECT_TRUE(get_theme_supplier(theme_service));
274 EXPECT_EQ(get_theme_supplier(theme_service)->get_theme_type(), 274 EXPECT_EQ(get_theme_supplier(theme_service)->get_theme_type(),
275 CustomThemeSupplier::SUPERVISED_USER_THEME); 275 CustomThemeSupplier::SUPERVISED_USER_THEME);
276 } 276 }
277 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) 277 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
278 #endif // defined(ENABLE_MANAGED_USERS) 278 #endif // defined(ENABLE_MANAGED_USERS)
279 279
280 }; // namespace theme_service_internal 280 }; // namespace theme_service_internal
OLDNEW
« no previous file with comments | « chrome/browser/themes/theme_service_factory.h ('k') | chrome/browser/themes/theme_syncable_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698