| Index: chrome/browser/extensions/extension_install_ui.cc
|
| ===================================================================
|
| --- chrome/browser/extensions/extension_install_ui.cc (revision 72158)
|
| +++ chrome/browser/extensions/extension_install_ui.cc (working copy)
|
| @@ -228,9 +228,10 @@
|
| }
|
| }
|
|
|
| -void ExtensionInstallUI::ShowThemeInfoBar(
|
| - const std::string& previous_theme_id, bool previous_use_system_theme,
|
| - const Extension* new_theme, Profile* profile) {
|
| +void ExtensionInstallUI::ShowThemeInfoBar(const std::string& previous_theme_id,
|
| + bool previous_use_system_theme,
|
| + const Extension* new_theme,
|
| + Profile* profile) {
|
| if (!new_theme->is_theme())
|
| return;
|
|
|
| @@ -263,10 +264,8 @@
|
| }
|
|
|
| // Then either replace that old one or add a new one.
|
| - InfoBarDelegate* new_delegate =
|
| - GetNewThemeInstalledInfoBarDelegate(
|
| - tab_contents, new_theme,
|
| - previous_theme_id, previous_use_system_theme);
|
| + InfoBarDelegate* new_delegate = GetNewThemeInstalledInfoBarDelegate(
|
| + tab_contents, new_theme, previous_theme_id, previous_use_system_theme);
|
|
|
| if (old_delegate)
|
| tab_contents->ReplaceInfoBar(old_delegate, new_delegate);
|
| @@ -303,20 +302,22 @@
|
| extension_name) +
|
| UTF8ToUTF16(" ") +
|
| l10n_util::GetStringUTF16(IDS_EXTENSION_INSTALLED_MANAGE_INFO_MAC);
|
| - InfoBarDelegate* delegate = new SimpleAlertInfoBarDelegate(
|
| - tab_contents, msg, new SkBitmap(icon_), true);
|
| + InfoBarDelegate* delegate = new SimpleAlertInfoBarDelegate(tab_contents,
|
| + new SkBitmap(icon_), msg, true);
|
| tab_contents->AddInfoBar(delegate);
|
| }
|
| #endif
|
|
|
| InfoBarDelegate* ExtensionInstallUI::GetNewThemeInstalledInfoBarDelegate(
|
| - TabContents* tab_contents, const Extension* new_theme,
|
| - const std::string& previous_theme_id, bool previous_use_system_theme) {
|
| + TabContents* tab_contents,
|
| + const Extension* new_theme,
|
| + const std::string& previous_theme_id,
|
| + bool previous_use_system_theme) {
|
| #if defined(TOOLKIT_GTK)
|
| return new GtkThemeInstalledInfoBarDelegate(tab_contents, new_theme,
|
| previous_theme_id, previous_use_system_theme);
|
| #else
|
| return new ThemeInstalledInfoBarDelegate(tab_contents, new_theme,
|
| - previous_theme_id);
|
| + previous_theme_id);
|
| #endif
|
| }
|
|
|