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

Side by Side Diff: chrome/browser/sync/test/integration/themes_helper.cc

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 6 Created 8 years, 7 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) 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/sync/test/integration/themes_helper.h" 5 #include "chrome/browser/sync/test/integration/themes_helper.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "chrome/browser/themes/theme_service.h" 9 #include "chrome/browser/themes/theme_service.h"
10 #include "chrome/browser/themes/theme_service_factory.h" 10 #include "chrome/browser/themes/theme_service_factory.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 return SyncExtensionHelper::GetInstance()-> 53 return SyncExtensionHelper::GetInstance()->
54 IsExtensionPendingInstallForSync(profile, id); 54 IsExtensionPendingInstallForSync(profile, id);
55 } 55 }
56 56
57 bool HasOrWillHaveCustomTheme(Profile* profile, const std::string& id) { 57 bool HasOrWillHaveCustomTheme(Profile* profile, const std::string& id) {
58 return (GetThemeID(profile) == id) || ThemeIsPendingInstall(profile, id); 58 return (GetThemeID(profile) == id) || ThemeIsPendingInstall(profile, id);
59 } 59 }
60 60
61 void UseCustomTheme(Profile* profile, int index) { 61 void UseCustomTheme(Profile* profile, int index) {
62 SyncExtensionHelper::GetInstance()->InstallExtension( 62 SyncExtensionHelper::GetInstance()->InstallExtension(
63 profile, MakeName(index), Extension::TYPE_THEME); 63 profile, MakeName(index), extensions::Extension::TYPE_THEME);
64 } 64 }
65 65
66 void UseDefaultTheme(Profile* profile) { 66 void UseDefaultTheme(Profile* profile) {
67 GetThemeService(profile)->UseDefaultTheme(); 67 GetThemeService(profile)->UseDefaultTheme();
68 } 68 }
69 69
70 void UseNativeTheme(Profile* profile) { 70 void UseNativeTheme(Profile* profile) {
71 // TODO(akalin): Fix this inconsistent naming in the theme service. 71 // TODO(akalin): Fix this inconsistent naming in the theme service.
72 GetThemeService(profile)->SetNativeTheme(); 72 GetThemeService(profile)->SetNativeTheme();
73 } 73 }
74 74
75 } // namespace themes_helper 75 } // namespace themes_helper
OLDNEW
« no previous file with comments | « chrome/browser/sync/test/integration/sync_extension_helper.cc ('k') | chrome/browser/tab_contents/render_view_context_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698