diff options
author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-21 03:02:34 +0000 |
---|---|---|
committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-21 03:02:34 +0000 |
commit | 1c321ee57a522e891d91a41a09bd900f0afd6f0d (patch) | |
tree | bb6e35526d52b50d8e37216e8605c7b4aa08c86a /chrome/browser/extensions/theme_installed_infobar_delegate.cc | |
parent | e2a374f50043586ff684e0720bbbd99b9aa15c07 (diff) | |
download | chromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.zip chromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.tar.gz chromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.tar.bz2 |
Move Extension into extensions namespace
BUG=117262
TBR=aa@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10375021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/theme_installed_infobar_delegate.cc')
-rw-r--r-- | chrome/browser/extensions/theme_installed_infobar_delegate.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.cc b/chrome/browser/extensions/theme_installed_infobar_delegate.cc index e6a9373..36f023b 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); |