Revert r124635 "Record taskbar launch mode in UMA histogram"

chrome/browser/ui/browser_init.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/ui/browser_init.h"
 
 #include <algorithm>   // For max().
 #include <set>
 
 #include "base/bind.h"
@@ skipping 109 matching lines @@
 #if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chromeos/legacy_window_manager/wm_message_listener.h"
 #endif
 #endif
 
 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
 #include "ui/base/touch/touch_factory.h"
 #endif
 
 #if defined(OS_WIN)
-#include "base/win/windows_version.h"
 #include "chrome/installer/util/auto_launch_util.h"
 #endif
 
 using content::BrowserThread;
 using content::ChildProcessSecurityPolicy;
 using content::OpenURLParams;
 using content::Referrer;
 using content::WebContents;
 
 namespace {
@@ skipping 345 matching lines @@
 
 enum LaunchMode {
   LM_TO_BE_DECIDED = 0,       // Possibly direct launch or via a shortcut.
   LM_AS_WEBAPP,               // Launched as a installed web application.
   LM_WITH_URLS,               // Launched with urls in the cmd line.
   LM_SHORTCUT_NONE,           // Not launched from a shortcut.
   LM_SHORTCUT_NONAME,         // Launched from shortcut but no name available.
   LM_SHORTCUT_UNKNOWN,        // Launched from user-defined shortcut.
   LM_SHORTCUT_QUICKLAUNCH,    // Launched from the quick launch bar.
   LM_SHORTCUT_DESKTOP,        // Launched from a desktop shortcut.
-  LM_SHORTCUT_TASKBAR,        // Launched from the taskbar.
+  LM_SHORTCUT_STARTMENU,      // Launched from start menu.
   LM_LINUX_MAC_BEOS           // Other OS buckets start here.
 };
 
 #if defined(OS_WIN)
 // Undocumented flag in the startup info structure tells us what shortcut was
 // used to launch the browser. See http://www.catch22.net/tuts/undoc01 for
 // more information. Confirmed to work on XP, Vista and Win7.
 LaunchMode GetLaunchShortcutKind() {
   STARTUPINFOW si = { sizeof(si) };
   GetStartupInfoW(&si);
   if (si.dwFlags & 0x800) {
     if (!si.lpTitle)
       return LM_SHORTCUT_NONAME;
-    string16 shortcut(si.lpTitle);
+    std::wstring shortcut(si.lpTitle);
     // The windows quick launch path is not localized.
-    if (shortcut.find(L"\\Quick Launch\\") != string16::npos) {
-      if (base::win::GetVersion() >= base::win::VERSION_WIN7)
-        return LM_SHORTCUT_TASKBAR;
-      else
-        return LM_SHORTCUT_QUICKLAUNCH;
-    }
+    if (shortcut.find(L"\\Quick Launch\\") != std::wstring::npos)
+      return LM_SHORTCUT_QUICKLAUNCH;
     scoped_ptr<base::Environment> env(base::Environment::Create());
     std::string appdata_path;
     env->GetVar("USERPROFILE", &appdata_path);
     if (!appdata_path.empty() &&
         shortcut.find(ASCIIToWide(appdata_path)) != std::wstring::npos)
       return LM_SHORTCUT_DESKTOP;
     return LM_SHORTCUT_UNKNOWN;
   }
   return LM_SHORTCUT_NONE;
 }
@@ skipping 1397 matching lines @@
 
   Profile* profile = ProfileManager::GetLastUsedProfile();
   if (!profile) {
     // We should only be able to get here if the profile already exists and
     // has been created.
     NOTREACHED();
     return;
   }
   ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, Profiles(), NULL, NULL);
 }