summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/autocomplete/builtin_provider.cc1
-rw-r--r--chrome/browser/download/download_browsertest.cc3
-rw-r--r--chrome/browser/extensions/extension_browsertests_misc.cc6
-rw-r--r--chrome/browser/extensions/extension_context_menu_model.cc3
-rw-r--r--chrome/browser/resources/options/extension_settings.js6
-rw-r--r--chrome/browser/ui/browser.cc6
-rw-r--r--chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm3
-rw-r--r--chrome/browser/ui/panels/panel_settings_menu_model.cc5
-rw-r--r--chrome/browser/ui/webui/ntp/ntp_resource_cache.cc8
-rw-r--r--chrome/common/url_constants.cc1
-rw-r--r--chrome/common/url_constants.h1
-rw-r--r--chrome/test/automation/automation_proxy_uitest.cc3
12 files changed, 27 insertions, 19 deletions
diff --git a/chrome/browser/autocomplete/builtin_provider.cc b/chrome/browser/autocomplete/builtin_provider.cc
index 7fb5159..54a1b60 100644
--- a/chrome/browser/autocomplete/builtin_provider.cc
+++ b/chrome/browser/autocomplete/builtin_provider.cc
@@ -20,6 +20,7 @@ const char* kChromeSettingsSubPages[] = {
chrome::kClearBrowserDataSubPage,
chrome::kContentSettingsSubPage,
chrome::kContentSettingsExceptionsSubPage,
+ chrome::kExtensionsSubPage,
chrome::kImportDataSubPage,
chrome::kInstantConfirmPage,
chrome::kLanguageOptionsSubPage,
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index e17d5b6..20a355c 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -1500,7 +1500,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, ChromeURLAfterDownload) {
FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
GURL download_url(URLRequestMockHTTPJob::GetMockUrl(file));
GURL flags_url(chrome::kChromeUIFlagsURL);
- GURL extensions_url(chrome::kChromeUIExtensionsURL);
+ GURL extensions_url(GURL(std::string(chrome::kChromeUISettingsURL) +
+ chrome::kExtensionsSubPage));
ui_test_utils::NavigateToURL(browser(), flags_url);
DownloadAndWait(browser(), download_url, EXPECT_NO_SELECT_DIALOG);
diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc
index ed0d8462..6bfae44 100644
--- a/chrome/browser/extensions/extension_browsertests_misc.cc
+++ b/chrome/browser/extensions/extension_browsertests_misc.cc
@@ -826,8 +826,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_OptionsPage) {
ASSERT_EQ(1u, extensions->size());
const Extension* extension = extensions->at(0);
- // Go to the chrome://extensions page and click the Options button.
- ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIExtensionsURL));
+ // Go to the Extension Settings page and click the Options button.
+ ui_test_utils::NavigateToURL(
+ browser(), GURL(std::string(chrome::kChromeUISettingsURL) +
+ chrome::kExtensionsSubPage));
TabStripModel* tab_strip = browser()->tabstrip_model();
ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
browser()->GetSelectedTabContents()->render_view_host(), L"",
diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc
index 6f2a0d0..c0d870f 100644
--- a/chrome/browser/extensions/extension_context_menu_model.cc
+++ b/chrome/browser/extensions/extension_context_menu_model.cc
@@ -136,8 +136,7 @@ void ExtensionContextMenuModel::ExecuteCommand(int command_id) {
break;
}
case MANAGE: {
- browser_->OpenURL(GURL(chrome::kChromeUIExtensionsURL), GURL(),
- SINGLETON_TAB, PageTransition::LINK);
+ browser_->ShowOptionsTab(chrome::kExtensionsSubPage);
break;
}
case INSPECT_POPUP: {
diff --git a/chrome/browser/resources/options/extension_settings.js b/chrome/browser/resources/options/extension_settings.js
index d58d482..0beff40 100644
--- a/chrome/browser/resources/options/extension_settings.js
+++ b/chrome/browser/resources/options/extension_settings.js
@@ -2,6 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+// Used for observing function of the backend datasource for this page by
+// tests.
+var webui_responded_ = false;
+
cr.define('options', function() {
var OptionsPage = options.OptionsPage;
var ExtensionsList = options.ExtensionsList;
@@ -143,6 +147,8 @@ cr.define('options', function() {
* the current state of installed extensions.
*/
ExtensionSettings.returnExtensionsData = function(extensionsData) {
+ webui_responded_ = true;
+
$('no-extensions').hidden = true;
$('suggest-gallery').hidden = true;
$('get-more-extensions-container').hidden = true;
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",
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 9221558..cd3bd9e 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -221,6 +221,7 @@ const char kClearBrowserDataSubPage[] = "clearBrowserData";
const char kContentSettingsSubPage[] = "content";
const char kContentSettingsExceptionsSubPage[] = "contentExceptions";
const char kHandlerSettingsSubPage[] = "handlers";
+const char kExtensionsSubPage[] = "extensionSettings";
const char kImportDataSubPage[] = "importData";
const char kInstantConfirmPage[] = "instantConfirm";
const char kLanguageOptionsSubPage[] = "languages";
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 740a01b..ee39535 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -216,6 +216,7 @@ extern const char kBrowserOptionsSubPage[];
extern const char kClearBrowserDataSubPage[];
extern const char kContentSettingsSubPage[];
extern const char kContentSettingsExceptionsSubPage[];
+extern const char kExtensionsSubPage[];
extern const char kHandlerSettingsSubPage[];
extern const char kImportDataSubPage[];
extern const char kInstantConfirmPage[];
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index b7c5d29..e8c8dfea 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -513,8 +513,7 @@ TEST_F(AutomationProxyTest, AcceleratorExtensions) {
ASSERT_TRUE(window->RunCommand(IDC_MANAGE_EXTENSIONS));
- // We expect the RunCommand above to wait until the title is updated.
- EXPECT_EQ(L"Extensions", GetActiveTabTitle());
+ EXPECT_EQ("chrome://settings/extensionSettings", GetActiveTabURL().spec());
}
TEST_F(AutomationProxyTest, AcceleratorHistory) {
generated by cgit v1.1 at 2025-01-18 06:52:23 +0000