chrome/browser/ui/webui/extensions/extension_settings_handler.cc - Issue 575113002: Move Webstore URL concepts to //extensions

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/extensions/extension_settings_handler.cc

Issue 575113002: Move Webstore URL concepts to //extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Dedupe constants, rename GetExtensionGalleryURL, cleanup comments. Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc ('k') | chrome/browser/ui/webui/ntp/ntp_resource_cache.cc » ('j') | extensions/common/extension_urls.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/extensions/extension_settings_handler.cc

diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc

index 20e6b3fc28c78ee2ae84cc5f6392652a0eedeb38..b1ee352e7321cc4c136761a0e143cc64adba9d16 100644

--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc

+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc

@@ -54,7 +54,6 @@

#include "chrome/browser/ui/webui/extensions/extension_icon_source.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/chrome_version_info.h"

-#include "chrome/common/extensions/extension_constants.h"

#include "chrome/common/extensions/features/feature_channel.h"

#include "chrome/common/extensions/manifest_url_handler.h"

#include "chrome/common/pref_names.h"

@@ -89,6 +88,7 @@

#include "extensions/common/extension.h"

#include "extensions/common/extension_icon_set.h"

#include "extensions/common/extension_set.h"

+#include "extensions/common/extension_urls.h"

#include "extensions/common/feature_switch.h"

#include "extensions/common/manifest.h"

#include "extensions/common/manifest_handlers/background_info.h"

@@ -471,15 +471,16 @@ void ExtensionSettingsHandler::GetLocalizedValues(

IDS_EXTENSIONS_NONE_INSTALLED_SUGGEST_GALLERY,

base::ASCIIToUTF16(

google_util::AppendGoogleLocaleParam(

- GURL(extension_urls::GetExtensionGalleryURL()),

+ GURL(extension_urls::GetWebstoreExtensionsCategoryURL()),

g_browser_process->GetApplicationLocale()).spec())));

source->AddString("extensionSettingsGetMoreExtensions",

l10n_util::GetStringUTF16(IDS_GET_MORE_EXTENSIONS));

- source->AddString("extensionSettingsGetMoreExtensionsUrl",

- base::ASCIIToUTF16(

- google_util::AppendGoogleLocaleParam(

- GURL(extension_urls::GetExtensionGalleryURL()),

- g_browser_process->GetApplicationLocale()).spec()));

+ source->AddString(

+ "extensionSettingsGetMoreExtensionsUrl",

+ base::ASCIIToUTF16(

+ google_util::AppendGoogleLocaleParam(

+ GURL(extension_urls::GetWebstoreExtensionsCategoryURL()),

+ g_browser_process->GetApplicationLocale()).spec()));

source->AddString("extensionSettingsExtensionId",

l10n_util::GetStringUTF16(IDS_EXTENSIONS_ID));

source->AddString("extensionSettingsExtensionPath",