[NTP] Fix identification of the web store app.

chrome/browser/ui/webui/ntp/app_launcher_handler.cc

 // Copyright (c) 2011 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/browser/ui/webui/ntp/app_launcher_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/auto_reset.h"
@@ skipping 32 matching lines @@
 #include "webkit/glue/window_open_disposition.h"
 
 namespace {
 
 // The URL prefixes used by the NTP to signal when the web store or an app
 // has launched so we can record the proper histogram.
 const char* kPingLaunchAppByID = "record-app-launch-by-id";
 const char* kPingLaunchWebStore = "record-webstore-launch";
 const char* kPingLaunchAppByURL = "record-app-launch-by-url";
 
-const char* kChromeWebStoreUrl = "https://chrome.google.com/webstore/";
-
 const UnescapeRule::Type kUnescapeRules =
     UnescapeRule::NORMAL | UnescapeRule::URL_SPECIAL_CHARS;
 
 extension_misc::AppLaunchBucket ParseLaunchSource(
     const std::string& launch_source) {
   int bucket_num = extension_misc::APP_LAUNCH_BUCKET_INVALID;
   base::StringToInt(launch_source, &bucket_num);
   extension_misc::AppLaunchBucket bucket =
       static_cast<extension_misc::AppLaunchBucket>(bucket_num);
   CHECK(bucket < extension_misc::APP_LAUNCH_BUCKET_BOUNDARY);
@@ skipping 159 matching lines @@
 }
 
 void AppLauncherHandler::FillAppDictionary(DictionaryValue* dictionary) {
   ListValue* list = new ListValue();
   const ExtensionList* extensions = extensions_service_->extensions();
   ExtensionList::const_iterator it;
   for (it = extensions->begin(); it != extensions->end(); ++it) {
     // Don't include the WebStore.
     // The WebStore launcher gets special treatment in ntp/apps.js.
     if ((*it)->is_app() &&
-        (*it)->GetFullLaunchURL().spec() != kChromeWebStoreUrl) {
+        (*it)->id() != extension_misc::kWebStoreAppId) {
       DictionaryValue* app_info = new DictionaryValue();
       CreateAppInfo(*it, extensions_service_->extension_prefs(), app_info);
       list->Append(app_info);
     }
   }
 
   extensions = extensions_service_->disabled_extensions();
   for (it = extensions->begin(); it != extensions->end(); ++it) {
     if ((*it)->is_app() &&
-        (*it)->GetFullLaunchURL().spec() != kChromeWebStoreUrl) {
+        (*it)->id() != extension_misc::kWebStoreAppId) {
       DictionaryValue* app_info = new DictionaryValue();
       CreateAppInfo(*it, extensions_service_->extension_prefs(), app_info);
       list->Append(app_info);
     }
   }
 
   dictionary->Set("apps", list);
 
 #if defined(OS_MACOSX)
   // App windows are not yet implemented on mac.
@@ skipping 399 matching lines @@
 
 void AppLauncherHandler::UninstallDefaultApps() {
   AppsPromo* apps_promo = extensions_service_->apps_promo();
   const ExtensionIdSet& app_ids = apps_promo->old_default_apps();
   for (ExtensionIdSet::const_iterator iter = app_ids.begin();
        iter != app_ids.end(); ++iter) {
     if (extensions_service_->GetExtensionById(*iter, true))
       extensions_service_->UninstallExtension(*iter, false, NULL);
   }
 }