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

Unified Diff: chrome/browser/extensions/theme_installed_infobar_delegate.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/theme_installed_infobar_delegate.cc
diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.cc b/chrome/browser/extensions/theme_installed_infobar_delegate.cc
index e6a93737504b32777c68a987c030a8770a69dcb3..36f023b7118f8fd2508b5aa334f50ec655e87d4b 100644
--- a/chrome/browser/extensions/theme_installed_infobar_delegate.cc
+++ b/chrome/browser/extensions/theme_installed_infobar_delegate.cc
@@ -23,7 +23,7 @@ ThemeInstalledInfoBarDelegate::ThemeInstalledInfoBarDelegate(
InfoBarTabHelper* infobar_helper,
ExtensionService* extension_service,
ThemeService* theme_service,
- const Extension* new_theme,
+ const extensions::Extension* new_theme,
const std::string& previous_theme_id,
bool previous_using_native_theme)
: ConfirmInfoBarDelegate(infobar_helper),
@@ -38,7 +38,8 @@ ThemeInstalledInfoBarDelegate::ThemeInstalledInfoBarDelegate(
content::Source<ThemeService>(theme_service_));
}
-bool ThemeInstalledInfoBarDelegate::MatchesTheme(const Extension* theme) const {
+bool ThemeInstalledInfoBarDelegate::MatchesTheme(
+ const extensions::Extension* theme) const {
return theme && (theme->id() == theme_id_);
}
@@ -51,7 +52,7 @@ ThemeInstalledInfoBarDelegate::~ThemeInstalledInfoBarDelegate() {
bool ThemeInstalledInfoBarDelegate::Cancel() {
if (!previous_theme_id_.empty()) {
- const Extension* previous_theme =
+ const extensions::Extension* previous_theme =
extension_service_->GetExtensionById(previous_theme_id_, true);
if (previous_theme) {
theme_service_->SetTheme(previous_theme);
« no previous file with comments | « chrome/browser/extensions/theme_installed_infobar_delegate.h ('k') | chrome/browser/extensions/unpacked_installer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698