diff options
author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-13 03:22:55 +0000 |
---|---|---|
committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-13 03:22:55 +0000 |
commit | 448d7dc919e6d471eb495db616a32fdce3191721 (patch) | |
tree | 63754b2e343891b20072b57a97abac680160e8a5 /chrome/browser/extensions/theme_installed_infobar_delegate.cc | |
parent | bde5f1c5afafb7ccae0de492214149dfc28054b4 (diff) | |
download | chromium_src-448d7dc919e6d471eb495db616a32fdce3191721.zip chromium_src-448d7dc919e6d471eb495db616a32fdce3191721.tar.gz chromium_src-448d7dc919e6d471eb495db616a32fdce3191721.tar.bz2 |
Improve some naming
"Native" theme is sometimes synonymous with "system" theme, and sometimes not. Change some uses of "native" to "system" to avoid confusion with the class called NativeTheme.
BUG=none
Review URL: https://codereview.chromium.org/244893004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269985 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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.cc b/chrome/browser/extensions/theme_installed_infobar_delegate.cc index 2b9b673..e3f5c8c 100644 --- a/chrome/browser/extensions/theme_installed_infobar_delegate.cc +++ b/chrome/browser/extensions/theme_installed_infobar_delegate.cc @@ -28,7 +28,7 @@ void ThemeInstalledInfoBarDelegate::Create( const extensions::Extension* new_theme, Profile* profile, const std::string& previous_theme_id, - bool previous_using_native_theme) { + bool previous_using_system_theme) { DCHECK(new_theme); if (!new_theme->is_theme()) return; @@ -52,7 +52,7 @@ void ThemeInstalledInfoBarDelegate::Create( ConfirmInfoBarDelegate::CreateInfoBar(scoped_ptr<ConfirmInfoBarDelegate>( new ThemeInstalledInfoBarDelegate( profile->GetExtensionService(), theme_service, new_theme, - previous_theme_id, previous_using_native_theme)))); + previous_theme_id, previous_using_system_theme)))); // If there's a previous theme infobar, just replace that instead of adding a // new one. @@ -82,14 +82,14 @@ ThemeInstalledInfoBarDelegate::ThemeInstalledInfoBarDelegate( ThemeService* theme_service, const extensions::Extension* new_theme, const std::string& previous_theme_id, - bool previous_using_native_theme) + bool previous_using_system_theme) : ConfirmInfoBarDelegate(), extension_service_(extension_service), theme_service_(theme_service), name_(new_theme->name()), theme_id_(new_theme->id()), previous_theme_id_(previous_theme_id), - previous_using_native_theme_(previous_using_native_theme) { + previous_using_system_theme_(previous_using_system_theme) { registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED, content::Source<ThemeService>(theme_service_)); } @@ -142,8 +142,8 @@ bool ThemeInstalledInfoBarDelegate::Cancel() { } } - if (previous_using_native_theme_) - theme_service_->SetNativeTheme(); + if (previous_using_system_theme_) + theme_service_->UseSystemTheme(); else theme_service_->UseDefaultTheme(); return false; // The theme change will close us. |