Revert r124635 "Record taskbar launch mode in UMA histogram"

Revert r124635 "Record taskbar launch mode in UMA histogram"

Causes a debug-only compile failure on Windows.

TBR=ben@chromium.org
BUG=
TEST=

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=124644

[Ben Goodger (Google), 2012-03-02 15:32:04]

This was 12636. 12635 was an aura-only change. The errors looked unrelated
to my code. Are you sure it doesn't just need a clobber? It was submitted
via cq so the cq win bot should have passed...

If 12636 was actually the offending revision, then I am not the person to
review it, but LGTM anyway :-)

-Ben

On Fri, Mar 2, 2012 at 7:21 AM, <maruel@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> Revert r124635 "Record taskbar launch mode in UMA histogram"
>
> Causes a debug-only compile failure on Windows.
>
> TBR=ben@chromium.org
> BUG=
> TEST=
>
>
> Please review this at
https://chromiumcodereview.**appspot.com/9582008/<https://chromiumcodereview....
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>  M chrome/browser/ui/browser_**init.cc
>
>
> Index: chrome/browser/ui/browser_**init.cc
> diff --git a/chrome/browser/ui/browser_**init.cc
> b/chrome/browser/ui/browser_**init.cc
> index 03354148bf9594c25d1c4228d90d3d**d79351498d..**
> c3b3a4a27d6218717fc0a8bb5e6057**3b129fecff 100644
> --- a/chrome/browser/ui/browser_**init.cc
> +++ b/chrome/browser/ui/browser_**init.cc
> @@ -127,7 +127,6 @@
>  #endif
>
>  #if defined(OS_WIN)
> -#include "base/win/windows_version.h"
>  #include "chrome/installer/util/auto_**launch_util.h"
>  #endif
>
> @@ -493,7 +492,7 @@ enum LaunchMode {
>   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.
>  };
>
> @@ -507,14 +506,10 @@ LaunchMode GetLaunchShortcutKind() {
>   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);
>
>
>

[M-A Ruel, 2012-03-02 15:39:22]

On 2012/03/02 15:32:04, Ben Goodger (Google) wrote:
> This was 12636. 12635 was an aura-only change. The errors looked unrelated
> to my code. Are you sure it doesn't just need a clobber? It was submitted
> via cq so the cq win bot should have passed...
> 
> If 12636 was actually the offending revision, then I am not the person to
> review it, but LGTM anyway :-)

http://build.chromium.org/p/chromium/waterfall?builder=Win%20Builder%20(dbg)

In particular, the initial failures;
http://build.chromium.org/p/chromium/builders/Win%20Builder%20%28dbg%29/build...
and the first success;
http://build.chromium.org/p/chromium/builders/Win%20Builder%20%28dbg%29/build...

So yes, it looks like I was wrong (!?)

Sorry about that. :( Can you recommit the patch?

M-A

[M-A Ruel, 2012-03-02 15:40:21]

And yes I also reverted the wrong revision in addition. Doh, not my day. I'll
just recommit it. Sorry for the noise.