Move GetWebstoreLaunchURL and GetWebstoreItemDetailURLPrefix to extensions/common/extension_urls.h.

chrome/common/extensions/extension_constants.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/extension_constants.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "chrome/common/chrome_switches.h"
-#include "net/base/escape.h"
-#include "net/base/url_util.h"
 
 namespace extension_urls {
 
-std::string GetWebstoreLaunchURL() {
-  std::string gallery_prefix = kGalleryBrowsePrefix;
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppsGalleryURL))
-    gallery_prefix = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-        switches::kAppsGalleryURL);
-  if (EndsWith(gallery_prefix, "/", true))
-    gallery_prefix = gallery_prefix.substr(0, gallery_prefix.length() - 1);
-  return gallery_prefix;
-}
-
-std::string GetExtensionGalleryURL() {
-  return GetWebstoreLaunchURL() + "/category/extensions";
-}
-
-std::string GetWebstoreItemDetailURLPrefix() {
-  return GetWebstoreLaunchURL() + "/detail/";
-}
-
-GURL GetWebstoreItemJsonDataURL(const std::string& extension_id) {
-  return GURL(GetWebstoreLaunchURL() + "/inlineinstall/detail/" + extension_id);
-}
-
-GURL GetWebstoreJsonSearchUrl(const std::string& query, const std::string& hl) {
-  GURL url(GetWebstoreLaunchURL() + "/jsonsearch");
-  url = net::AppendQueryParameter(url, "q", query);
-  url = net::AppendQueryParameter(url, "hl", hl);
-  return url;
-}
-
-GURL GetWebstoreSearchPageUrl(const std::string& query) {
-  return GURL(GetWebstoreLaunchURL() + "/search/" +
-              net::EscapeQueryParamValue(query, false));
-}

[miket_OOO, 2013/11/07 21:39:41]

I kind of regret that these are now getting sprayed all over the place. Are you
sure?

[Yoyo Zhou, 2013/11/08 02:03:09]

These belong to, for example, the app list and/or the webstore, and they're each
only used in that particular place. If there was a place to just have these
strings for the app list, that'd be great, but the rest of Chrome has no need
for them.

I'm not completely sure that this is better (what happens if these strings need
to change, for example? but that seems unlikely to ever happen), but I think it
is.

-
 const char kGalleryUpdateHttpsUrl[] =
     "https://clients2.google.com/service/update2/crx";
 // TODO(battre): Delete the HTTP URL once the blacklist is downloaded via HTTPS.
 const char kExtensionBlocklistUrlPrefix[] =
     "http://www.gstatic.com/chrome/extensions/blacklist";
 const char kExtensionBlocklistHttpsUrlPrefix[] =
     "https://www.gstatic.com/chrome/extensions/blacklist";
 
 GURL GetWebstoreUpdateUrl() {
   CommandLine* cmdline = CommandLine::ForCurrentProcess();
@@ skipping 17 matching lines @@
   // The extension blacklist URL is returned from the update service and
   // therefore not determined by Chromium. If the location of the blacklist file
   // ever changes, we need to update this function. A DCHECK in the
   // ExtensionUpdater ensures that we notice a change. This is the full URL
   // of a blacklist:
   // http://www.gstatic.com/chrome/extensions/blacklist/l_0_0_0_7.txt
   return StartsWithASCII(url.spec(), kExtensionBlocklistUrlPrefix, true) ||
       StartsWithASCII(url.spec(), kExtensionBlocklistHttpsUrlPrefix, true);
 }
 
-const char kGalleryBrowsePrefix[] = "https://chrome.google.com/webstore";
-
 const char kWebstoreSourceField[] = "utm_source";
 
 const char kLaunchSourceAppList[] = "chrome-app-launcher";
 const char kLaunchSourceAppListSearch[] = "chrome-app-launcher-search";
 
 }  // namespace extension_urls
 
 namespace extension_misc {
 
 const char kBookmarkManagerId[] = "eemcgdkfndhakfknompkggombfjjjeno";
@@ skipping 82 matching lines @@
 
 const int kScriptBadgeIconSizes[] = {
   EXTENSION_ICON_BITTY,  // 16
   2 * EXTENSION_ICON_BITTY  // 32
 };
 
 const size_t kNumScriptBadgeIconSizes =
     arraysize(kScriptBadgeIconSizes);
 
 }  // namespace extension_misc