Merge 250467 "Revert of Add UMA to track app launcher discoverab..."

chrome/browser/extensions/api/webstore_private/webstore_private_api.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/browser/extensions/api/webstore_private/webstore_private_api.h"
 
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 535 matching lines @@
     error_ = ErrorUtils::FormatErrorMessage(
         kNoPreviousBeginInstallWithManifestError, params->expected_id);
     return false;
   }
 
   // Balanced in OnExtensionInstallSuccess() or OnExtensionInstallFailure().
   AddRef();
   AppListService* app_list_service =
       AppListService::Get(GetCurrentBrowser()->host_desktop_type());
 
-  if (approval_->enable_launcher) {
-    app_list_service->EnableAppList(GetProfile(),
-                                    AppListService::ENABLE_FOR_APP_INSTALL);
-  }
+  if (approval_->enable_launcher)
+    app_list_service->EnableAppList(GetProfile());
 
   if (IsAppLauncherEnabled() && approval_->manifest->is_app()) {
     // Show the app list to show download is progressing. Don't show the app
     // list on first app install so users can be trained to open it themselves.
     if (approval_->enable_launcher)
       app_list_service->CreateForProfile(GetProfile());
     else
-      app_list_service->AutoShowForProfile(GetProfile());
+      app_list_service->ShowForProfile(GetProfile());
   }
 
   // The extension will install through the normal extension install flow, but
   // the whitelist entry will bypass the normal permissions install dialog.
   scoped_refptr<WebstoreInstaller> installer = new WebstoreInstaller(
       GetProfile(),
       this,
       &(dispatcher()->delegate()->GetAssociatedWebContents()->GetController()),
       params->expected_id,
       approval_.Pass(),
@@ skipping 38 matching lines @@
   Release();
 }
 
 WebstorePrivateEnableAppLauncherFunction::
     WebstorePrivateEnableAppLauncherFunction() {}
 
 WebstorePrivateEnableAppLauncherFunction::
     ~WebstorePrivateEnableAppLauncherFunction() {}
 
 bool WebstorePrivateEnableAppLauncherFunction::RunImpl() {
-  AppListService::Get(GetCurrentBrowser()->host_desktop_type())
-      ->EnableAppList(GetProfile(), AppListService::ENABLE_VIA_WEBSTORE_LINK);
+  AppListService::Get(GetCurrentBrowser()->host_desktop_type())->
+      EnableAppList(GetProfile());
   return true;
 }
 
 bool WebstorePrivateGetBrowserLoginFunction::RunImpl() {
   GetBrowserLogin::Results::Info info;
   info.login = GetProfile()->GetOriginalProfile()->GetPrefs()->GetString(
       prefs::kGoogleServicesUsername);
   results_ = GetBrowserLogin::Results::Create(info);
   return true;
 }
@@ skipping 42 matching lines @@
   return true;
 }
 
 bool WebstorePrivateIsInIncognitoModeFunction::RunImpl() {
   results_ = IsInIncognitoMode::Results::Create(
       GetProfile() != GetProfile()->GetOriginalProfile());
   return true;
 }
 
 }  // namespace extensions