Refactor handling of --show-app-list command line.

chrome/browser/ui/app_list/app_list_service.cc

 // 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.
 
 #include "chrome/browser/ui/app_list/app_list_service.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/process/process_info.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 
 namespace {
 
 enum StartupType {
   COLD_START,
   WARM_START,
   WARM_START_FAST,
 };
 
+// For when an app list show request is received via CommandLine. Indicates
+// whether the Profile the app list was previously showing was the SAME, OTHER
+// or NONE with respect to the new Profile to show.
+enum ProfileLoadState {
+  PROFILE_LOADED_SAME,
+  PROFILE_LOADED_OTHER,
+  PROFILE_LOADED_NONE,
+};
+
 base::Time GetOriginalProcessStartTime(const CommandLine& command_line) {
   if (command_line.HasSwitch(switches::kOriginalProcessStartTime)) {
     std::string start_time_string =
         command_line.GetSwitchValueASCII(switches::kOriginalProcessStartTime);
     int64 remote_start_time;
     base::StringToInt64(start_time_string, &remote_start_time);
     return base::Time::FromInternalValue(remote_start_time);
   }
 
 // base::CurrentProcessInfo::CreationTime() is only defined on some
@@ skipping 16 matching lines @@
 }
 
 // The time the process that caused the app list to be shown started. This isn't
 // necessarily the currently executing process as we may be processing a command
 // line given to a short-lived Chrome instance.
 int64 g_original_process_start_time;
 
 // The type of startup the the current app list show has gone through.
 StartupType g_app_show_startup_type;
 
-void RecordStartupInfo(StartupType startup_type, const base::Time& start_time) {
+// The state of the active app list profile at the most recent launch.
+ProfileLoadState g_profile_load_state;
+
+void RecordStartupInfo(StartupType startup_type,
+                       const base::Time& start_time,
+                       Profile* current_profile,
+                       Profile* launch_profile) {
   g_original_process_start_time = start_time.ToInternalValue();
   g_app_show_startup_type = startup_type;
+
+  if (!current_profile)
+    g_profile_load_state = PROFILE_LOADED_NONE;
+  else if (current_profile == launch_profile)
+    g_profile_load_state = PROFILE_LOADED_SAME;
+  else
+    g_profile_load_state = PROFILE_LOADED_OTHER;
 }
 
 void RecordFirstPaintTiming() {
   base::Time start_time(
       base::Time::FromInternalValue(g_original_process_start_time));
   base::TimeDelta elapsed = base::Time::Now() - start_time;
   switch (g_app_show_startup_type) {
     case COLD_START:
-      UMA_HISTOGRAM_LONG_TIMES("Startup.AppListFirstPaintColdStart", elapsed);
+      if (g_profile_load_state == PROFILE_LOADED_NONE)

[Matt Giuca, 2014/07/02 07:35:18]

nit: Can this just be a DCHECK (avoiding the NOTREACHED)?

[tapted, 2014/07/04 03:00:02]

Done.

+        UMA_HISTOGRAM_LONG_TIMES("Startup.AppListFirstPaintColdStart", elapsed);
+      else
+        NOTREACHED();
       break;
     case WARM_START:
-      UMA_HISTOGRAM_LONG_TIMES("Startup.AppListFirstPaintWarmStart", elapsed);
+      // For warm starts, only record showing the same profile. "NONE" should
+      // only occur in the first 30 seconds after startup. "OTHER" only occurs
+      // for multi-profile cases. In these cases, timings are also affected by
+      // whether or not a profile has been loaded from disk, which makes the
+      // profile load asynchronous and skews results unpredictably.
+      if (g_profile_load_state == PROFILE_LOADED_SAME)
+        UMA_HISTOGRAM_LONG_TIMES("Startup.AppListFirstPaintWarmStart", elapsed);
       break;
     case WARM_START_FAST:
-      UMA_HISTOGRAM_LONG_TIMES("Startup.AppListFirstPaintWarmStartFast",
-                               elapsed);
+      if (g_profile_load_state == PROFILE_LOADED_SAME) {
+        UMA_HISTOGRAM_LONG_TIMES("Startup.AppListFirstPaintWarmStartFast",
+                                 elapsed);
+      }
       break;
   }
 }
 
+void RecordStartupTimings(AppListService* service,

[Matt Giuca, 2014/07/02 07:35:18]

nit: I think it would read nicer if this method was just above or below
RecordStartupInfo.

[tapted, 2014/07/04 03:00:02]

Done - I think it reads nice that way too, but note it required a prototype
declaration for anonymous::RecordFirstPaintTiming();

[Matt Giuca, 2014/07/04 04:37:15]

Hmm that's not so nice. I'd be happy if you put it back where it was (to avoid a
forward declaration). Up to you!

+                          const CommandLine& command_line,

[Matt Giuca, 2014/07/02 07:35:18]

Your CL description mentions "RecordShowTimings"; since you've renamed this
method you should update the description.

[tapted, 2014/07/04 03:00:02]

Done.

+                          Profile* launch_profile) {
+  base::Time start_time = GetOriginalProcessStartTime(command_line);
+  if (start_time.is_null())
+    return;
+
+  base::TimeDelta elapsed = base::Time::Now() - start_time;
+  StartupType startup = GetStartupType(command_line);
+  switch (startup) {
+    case COLD_START:
+      UMA_HISTOGRAM_LONG_TIMES("Startup.ShowAppListColdStart", elapsed);
+      break;
+    case WARM_START:
+      UMA_HISTOGRAM_LONG_TIMES("Startup.ShowAppListWarmStart", elapsed);
+      break;
+    case WARM_START_FAST:
+      UMA_HISTOGRAM_LONG_TIMES("Startup.ShowAppListWarmStartFast", elapsed);
+      break;
+  }
+
+  Profile* current_profile = service->GetCurrentAppListProfile();
+  RecordStartupInfo(startup, start_time, current_profile, launch_profile);
+  service->SetAppListNextPaintCallback(RecordFirstPaintTiming);
+}
+
 }  // namespace
 
 // static
 void AppListService::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterInt64Pref(prefs::kLastAppListLaunchPing, 0);
   registry->RegisterIntegerPref(prefs::kAppListLaunchCount, 0);
   registry->RegisterInt64Pref(prefs::kLastAppListAppLaunchPing, 0);
   registry->RegisterIntegerPref(prefs::kAppListAppLaunchCount, 0);
   registry->RegisterStringPref(prefs::kAppListProfile, std::string());
   registry->RegisterBooleanPref(prefs::kAppLauncherIsEnabled, false);
   registry->RegisterBooleanPref(prefs::kAppLauncherHasBeenEnabled, false);
   registry->RegisterIntegerPref(prefs::kAppListEnableMethod,
                                 ENABLE_NOT_RECORDED);
   registry->RegisterInt64Pref(prefs::kAppListEnableTime, 0);
 
 #if defined(OS_MACOSX)
   registry->RegisterIntegerPref(prefs::kAppLauncherShortcutVersion, 0);
 #endif
 
   // Identifies whether we should show the app launcher promo or not.
   // Note that a field trial also controls the showing, so the promo won't show
   // unless the pref is set AND the field trial is set to a proper group.
   registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, true);
 }
 
 // static
-void AppListService::RecordShowTimings(const CommandLine& command_line) {
-  base::Time start_time = GetOriginalProcessStartTime(command_line);
-  if (start_time.is_null())
-    return;
+bool AppListService::HandleLaunchCommandLine(
+    const base::CommandLine& command_line,
+    Profile* launch_profile) {
+  InitAll(launch_profile);
+  if (!command_line.HasSwitch(switches::kShowAppList))
+    return false;
 
-  base::TimeDelta elapsed = base::Time::Now() - start_time;
-  StartupType startup = GetStartupType(command_line);
-  switch (startup) {
-    case COLD_START:
-      UMA_HISTOGRAM_LONG_TIMES("Startup.ShowAppListColdStart", elapsed);
-      break;
-    case WARM_START:
-      UMA_HISTOGRAM_LONG_TIMES("Startup.ShowAppListWarmStart", elapsed);
-      break;
-    case WARM_START_FAST:
-      UMA_HISTOGRAM_LONG_TIMES("Startup.ShowAppListWarmStartFast", elapsed);
-      break;
-  }
-
-  RecordStartupInfo(startup, start_time);
-  Get(chrome::HOST_DESKTOP_TYPE_NATIVE)->SetAppListNextPaintCallback(
-      RecordFirstPaintTiming);
+  // The --show-app-list switch is used for shortcuts on the native desktop.
+  AppListService* service =
+      AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE);
+  RecordStartupTimings(service, command_line, launch_profile);
+  service->ShowForProfile(launch_profile);
+  return true;
 }