diff options
Diffstat (limited to 'chrome/browser/ui')
4 files changed, 10 insertions, 12 deletions
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index a933cd8..bd22132 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -738,7 +738,8 @@ TabContents* Browser::OpenApplicationTab(Profile* profile, if (!extension_url.is_valid()) { extension_url = extension->options_url(); if (!extension_url.is_valid()) - extension_url = GURL(chrome::kChromeUIExtensionsURL); + extension_url = GURL(std::string(chrome::kChromeUISettingsURL) + + chrome::kExtensionsSubPage); } // TODO(erikkay): START_PAGE doesn't seem like the right transition in all @@ -2069,8 +2070,7 @@ void Browser::ShowDownloadsTab() { void Browser::ShowExtensionsTab() { UserMetrics::RecordAction(UserMetricsAction("ShowExtensions")); - ShowSingletonTabOverwritingNTP( - GetSingletonTabNavigateParams(GURL(chrome::kChromeUIExtensionsURL))); + ShowOptionsTab(chrome::kExtensionsSubPage); } void Browser::ShowAboutConflictsTab() { diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm index 01c8378..23119f2 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm @@ -265,8 +265,7 @@ int CurrentTabId() { break; } case kExtensionContextManage: { - browser->OpenURL(GURL(chrome::kChromeUIExtensionsURL), GURL(), - NEW_FOREGROUND_TAB, PageTransition::LINK); + browser->ShowOptionsTab(chrome::kExtensionsSubPage); break; } case kExtensionContextInspect: { diff --git a/chrome/browser/ui/panels/panel_settings_menu_model.cc b/chrome/browser/ui/panels/panel_settings_menu_model.cc index ed9f552..5be91be 100644 --- a/chrome/browser/ui/panels/panel_settings_menu_model.cc +++ b/chrome/browser/ui/panels/panel_settings_menu_model.cc @@ -96,10 +96,7 @@ void PanelSettingsMenuModel::ExecuteCommand(int command_id) { extension_uninstall_dialog_->ConfirmUninstall(this, extension); break; case COMMAND_MANAGE: - browser->OpenURL(GURL(chrome::kChromeUIExtensionsURL), - GURL(), - SINGLETON_TAB, - PageTransition::LINK); + browser->ShowOptionsTab(chrome::kExtensionsSubPage); break; default: NOTREACHED(); diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index aa38553..3984ea8 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -252,9 +252,11 @@ void NTPResourceCache::CreateNewTabIncognitoHTML() { l10n_util::GetStringFUTF16(new_tab_message_ids, GetUrlWithLang(GURL(new_tab_link)))); localized_strings.SetString("extensionsmessage", - l10n_util::GetStringFUTF16(IDS_NEW_TAB_OTR_EXTENSIONS_MESSAGE, - l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), - ASCIIToUTF16(chrome::kChromeUIExtensionsURL))); + l10n_util::GetStringFUTF16( + IDS_NEW_TAB_OTR_EXTENSIONS_MESSAGE, + l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), + ASCIIToUTF16(std::string(chrome::kChromeUISettingsURL) + + chrome::kExtensionsSubPage))); bool bookmark_bar_attached = profile_->GetPrefs()->GetBoolean( prefs::kShowBookmarkBar); localized_strings.SetString("bookmarkbarattached", |