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

chrome/browser/ui/app_list/app_list_service_impl.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_IMPL_H_
 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_IMPL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 10 matching lines @@
 class ProfileStore;
 
 namespace base {
 class FilePath;
 }
 
 // Parts of the AppListService implementation shared between platforms.
 class AppListServiceImpl : public AppListService,
                            public ProfileInfoCacheObserver {
  public:
+  static void RecordAppListLaunch();
+  static void RecordAppListAppLaunch();
   virtual ~AppListServiceImpl();
 
   // Constructor used for testing.
   AppListServiceImpl(const CommandLine& command_line,
                      PrefService* local_state,
                      scoped_ptr<ProfileStore> profile_store,
                      scoped_ptr<KeepAliveService> keep_alive_service);
 
-  void RecordAppListLaunch();
-  static void RecordAppListAppLaunch();
-
   // AppListService overrides:
   virtual void SetAppListNextPaintCallback(void (*callback)()) OVERRIDE;
   virtual void HandleFirstRun() OVERRIDE;
   virtual void Init(Profile* initial_profile) OVERRIDE;
   virtual base::FilePath GetProfilePath(
       const base::FilePath& user_data_dir) OVERRIDE;
   virtual void SetProfilePath(const base::FilePath& profile_path) OVERRIDE;
   virtual void Show() OVERRIDE;
-  virtual void AutoShowForProfile(Profile* requested_profile) OVERRIDE;
-  virtual void EnableAppList(Profile* initial_profile,
-                             AppListEnableSource enable_source) OVERRIDE;
+  virtual void EnableAppList(Profile* initial_profile) OVERRIDE;
 
  protected:
   AppListServiceImpl();
 
   void InvalidatePendingProfileLoads();
   ProfileLoader& profile_loader() { return *profile_loader_; }
   const ProfileLoader& profile_loader() const { return *profile_loader_; }
 
-  // Perform startup checks shared between desktop implementations of the app
-  // list. Currently this checks command line flags to enable or disable the app
-  // list, and records UMA stats delayed from a previous Chrome process.
-  void PerformStartupChecks(Profile* initial_profile);
+  // Process command line flags shared between desktop implementations of the
+  // app list. Currently this allows for enabling or disabling the app list.
+  void HandleCommandLineFlags(Profile* initial_profile);
+
+  // Records UMA stats that try to approximate usage after a delay.
+  void SendUsageStats();
 
   // Create a platform-specific shortcut for the app list.
   virtual void CreateShortcut();
 
  private:
   static void SendAppListStats();
 
   // Loads a profile asynchronously and calls OnProfileLoaded() when done.
   void LoadProfileAsync(const base::FilePath& profile_file_path);
 
   // Callback for asynchronous profile load.
   void OnProfileLoaded(int profile_load_sequence_id,
                        Profile* profile,
                        Profile::CreateStatus status);
 
   // ProfileInfoCacheObserver overrides:
   virtual void OnProfileWillBeRemoved(
       const base::FilePath& profile_path) OVERRIDE;
 
   scoped_ptr<ProfileStore> profile_store_;
   base::WeakPtrFactory<AppListServiceImpl> weak_factory_;
   CommandLine command_line_;
   PrefService* local_state_;
   scoped_ptr<ProfileLoader> profile_loader_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListServiceImpl);
 };
 
 #endif  // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_IMPL_H_