Fix GetAppShortcutName to return a localized name for Chrome

Fix GetAppShortcutName to return a localized name for Chrome.

Fixes a regression introduced in r108297.

std::wstring --> string16 in chrome/installer/util/browser_distribution.h and all of its descendants.

BUG=None
TEST=None

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=134543

[gab, 2012-04-27 01:33:19]

Made it a separate CL, PTAL, and feel free to CQ if ok.

[grt (UTC plus 2), 2012-04-27 13:00:25]

Thanks for taking care of this.  Looks good.  Just one style nit; see below.

https://chromiumcodereview.appspot.com/10246007/diff/1/chrome/installer/util/...
File chrome/installer/util/google_chrome_distribution.cc (right):

https://chromiumcodereview.appspot.com/10246007/diff/1/chrome/installer/util/...
chrome/installer/util/google_chrome_distribution.cc:429: std::wstring
GoogleChromeDistribution::GetAppShortCutName() {
same comment about ordering here.

https://chromiumcodereview.appspot.com/10246007/diff/1/chrome/installer/util/...
File chrome/installer/util/google_chrome_distribution.h (right):

https://chromiumcodereview.appspot.com/10246007/diff/1/chrome/installer/util/...
chrome/installer/util/google_chrome_distribution.h:46: virtual std::wstring
GetAppShortCutName() OVERRIDE;
move this between GetApplicationName and GetAlternateApplicationName so that the
ordering here matches that in the parent class.

[gab, 2012-04-27 17:48:33]

Fixed + addded to dummy implementation of GoogleChromeDistribution

+ string16 madness to make presubmit happy...

Feel free to CQ

[grt (UTC plus 2), 2012-04-27 18:23:07]

Some nits.  Please run a tryjob that hits the default set of bots.  I can't
remember if these headers are included on non-Windows platforms or not.  Thanks.

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
File chrome/installer/util/browser_distribution.h (right):

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/browser_distribution.h:41: string16 prefix;  // The
experiment code prefix for this experiment,
fix comment indentation

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
File chrome/installer/util/chrome_frame_distribution.h (right):

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/chrome_frame_distribution.h:12: #include <string>
remove this since the only uses of std::string are for BrowserDistribution
methods (std::string is part of BD's interface).

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/chrome_frame_distribution.h:13: #include <vector>
this seems stale.  please remove while you're here.

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/chrome_frame_distribution.h:15: #include "base/string16.h"
remove this for same reason as <string>

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
File chrome/installer/util/chromium_binaries_distribution.cc (right):

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/chromium_binaries_distribution.cc:1: // Copyright (c) 2011
The Chromium Authors. All rights reserved.
2011 -> 2012

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
File chrome/installer/util/chromium_binaries_distribution.h (right):

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/chromium_binaries_distribution.h:1: // Copyright (c) 2011
The Chromium Authors. All rights reserved.
2011 -> 2012

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/chromium_binaries_distribution.h:13: #include
"base/string16.h"
remove this since it's part of BrowserDistribution's interface

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
File chrome/installer/util/google_chrome_binaries_distribution.cc (right):

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/google_chrome_binaries_distribution.cc:1: // Copyright (c)
2011 The Chromium Authors. All rights reserved.
2011 -> 2012

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/google_chrome_binaries_distribution.cc:5: // This file
declares a class that contains various method related to branding.
While you're here: declares -> defines.

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
File chrome/installer/util/google_chrome_binaries_distribution.h (right):

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/google_chrome_binaries_distribution.h:1: // Copyright (c)
2011 The Chromium Authors. All rights reserved.
2011 -> 2012

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/google_chrome_binaries_distribution.h:11: #include
"base/string16.h"
remove

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
File chrome/installer/util/google_chrome_distribution.cc (right):

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/google_chrome_distribution.cc:338: const DictionaryValue&
root, string16* uninstall_metrics_string) {
please move the second arg to its own line

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
File chrome/installer/util/google_chrome_distribution.h (right):

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/google_chrome_distribution.h:12: #include <string>
remove this

[gab, 2012-04-27 20:58:45]

Addressed all nits. See below. Tries on the way.

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
File chrome/installer/util/browser_distribution.h (right):

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/browser_distribution.h:12: #include <vector>
Removed this too.

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/browser_distribution.h:41: string16 prefix;  // The
experiment code prefix for this experiment,
On 2012/04/27 18:23:07, grt wrote:
> fix comment indentation

Done.

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
File chrome/installer/util/chrome_frame_distribution.h (right):

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/chrome_frame_distribution.h:12: #include <string>
On 2012/04/27 18:23:07, grt wrote:
> remove this since the only uses of std::string are for BrowserDistribution
> methods (std::string is part of BD's interface).

Done.

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/chrome_frame_distribution.h:13: #include <vector>
On 2012/04/27 18:23:07, grt wrote:
> this seems stale.  please remove while you're here.

Done.

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/chrome_frame_distribution.h:15: #include "base/string16.h"
On 2012/04/27 18:23:07, grt wrote:
> remove this for same reason as <string>

Done.

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
File chrome/installer/util/chromium_binaries_distribution.cc (right):

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/chromium_binaries_distribution.cc:1: // Copyright (c) 2011
The Chromium Authors. All rights reserved.
On 2012/04/27 18:23:07, grt wrote:
> 2011 -> 2012

Done.

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
File chrome/installer/util/chromium_binaries_distribution.h (right):

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/chromium_binaries_distribution.h:1: // Copyright (c) 2011
The Chromium Authors. All rights reserved.
On 2012/04/27 18:23:07, grt wrote:
> 2011 -> 2012

Done.

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/chromium_binaries_distribution.h:13: #include
"base/string16.h"
On 2012/04/27 18:23:07, grt wrote:
> remove this since it's part of BrowserDistribution's interface

Done.

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
File chrome/installer/util/google_chrome_binaries_distribution.cc (right):

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/google_chrome_binaries_distribution.cc:1: // Copyright (c)
2011 The Chromium Authors. All rights reserved.
On 2012/04/27 18:23:07, grt wrote:
> 2011 -> 2012

Done.

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/google_chrome_binaries_distribution.cc:1: // Copyright (c)
2011 The Chromium Authors. All rights reserved.
On 2012/04/27 18:23:07, grt wrote:
> 2011 -> 2012

Done.

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/google_chrome_binaries_distribution.cc:5: // This file
declares a class that contains various method related to branding.
On 2012/04/27 18:23:07, grt wrote:
> While you're here: declares -> defines.

Done.

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/google_chrome_binaries_distribution.cc:5: // This file
declares a class that contains various method related to branding.
On 2012/04/27 18:23:07, grt wrote:
> While you're here: declares -> defines.

Done.

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
File chrome/installer/util/google_chrome_binaries_distribution.h (right):

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/google_chrome_binaries_distribution.h:1: // Copyright (c)
2011 The Chromium Authors. All rights reserved.
On 2012/04/27 18:23:07, grt wrote:
> 2011 -> 2012

Done.

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/google_chrome_binaries_distribution.h:5: // This file
declares a class that contains various method related to branding.
declares -> defines

Done here too.

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/google_chrome_binaries_distribution.h:11: #include
"base/string16.h"
On 2012/04/27 18:23:07, grt wrote:
> remove

Done.

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
File chrome/installer/util/google_chrome_distribution.cc (right):

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/google_chrome_distribution.cc:338: const DictionaryValue&
root, string16* uninstall_metrics_string) {
On 2012/04/27 18:23:07, grt wrote:
> please move the second arg to its own line

Done.

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
File chrome/installer/util/google_chrome_distribution.h (right):

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/google_chrome_distribution.h:12: #include <string>
On 2012/04/27 18:23:07, grt wrote:
> remove this

Done.

[grt (UTC plus 2), 2012-04-29 02:08:49]

Two final nits below.

Also, please add a note about the std::wstring -> string16 change to the CL
description.  Thanks.

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
File chrome/installer/util/google_chrome_binaries_distribution.h (right):

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/google_chrome_binaries_distribution.h:5: // This file
declares a class that contains various method related to branding.
On 2012/04/27 20:58:45, gab wrote:
> declares -> defines
> 
> Done here too.

please revert this change, as "declares" was correct here (the header contains
the declaration for the class and its members, the .cc file contains the
definitions).  thanks.

https://chromiumcodereview.appspot.com/10246007/diff/3005/chrome/installer/ut...
File chrome/installer/util/google_chrome_distribution.cc (right):

https://chromiumcodereview.appspot.com/10246007/diff/3005/chrome/installer/ut...
chrome/installer/util/google_chrome_distribution.cc:14: 
looks like this file has been missing a #include <vector> here.  would you mind
adding it while you're here?

[grt (UTC plus 2), 2012-04-29 02:13:10]

On 2012/04/29 02:08:49, grt wrote:
> Also, please add a note about the std::wstring -> string16 change to the CL
> description.  Thanks.

Ah, also, please change the BUG= and TEST= lines in the CL description to:

BUG=none
TEST=none

and mention that this fixes a regression introduced in r108297.  Thanks*2.

[gab, 2012-04-30 12:37:24]

Ready to go :)!

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
File chrome/installer/util/google_chrome_binaries_distribution.h (right):

https://chromiumcodereview.appspot.com/10246007/diff/7001/chrome/installer/ut...
chrome/installer/util/google_chrome_binaries_distribution.h:5: // This file
declares a class that contains various method related to branding.
On 2012/04/29 02:08:50, grt wrote:
> On 2012/04/27 20:58:45, gab wrote:
> > declares -> defines
> > 
> > Done here too.
> 
> please revert this change, as "declares" was correct here (the header contains
> the declaration for the class and its members, the .cc file contains the
> definitions).  thanks.

Right, reverted.

https://chromiumcodereview.appspot.com/10246007/diff/3005/chrome/installer/ut...
File chrome/installer/util/google_chrome_distribution.cc (right):

https://chromiumcodereview.appspot.com/10246007/diff/3005/chrome/installer/ut...
chrome/installer/util/google_chrome_distribution.cc:14: 
On 2012/04/29 02:08:50, grt wrote:
> looks like this file has been missing a #include <vector> here.  would you
mind
> adding it while you're here?

Done.

[grt (UTC plus 2), 2012-04-30 13:54:44]

On 2012/04/30 12:37:24, gab wrote:
> Ready to go :)!

LGTM with one final CL description change: 
google_chrome_binaries_distribution.h -> google_chrome_distribution.h.

[gab, 2012-04-30 14:04:51]

On 2012/04/30 13:54:44, grt wrote:
> On 2012/04/30 12:37:24, gab wrote:
> > Ready to go :)!
> 
> LGTM with one final CL description change: 
> google_chrome_binaries_distribution.h -> google_chrome_distribution.h.

Oops, wrong copy/paste path. We actually want browser_distribution.h though
right?

[grt (UTC plus 2), 2012-04-30 14:06:22]

On 2012/04/30 14:04:51, gab wrote:
> On 2012/04/30 13:54:44, grt wrote:
> > On 2012/04/30 12:37:24, gab wrote:
> > > Ready to go :)!
> > 
> > LGTM with one final CL description change: 
> > google_chrome_binaries_distribution.h -> google_chrome_distribution.h.
> 
> Oops, wrong copy/paste path. We actually want browser_distribution.h though
> right?

Ha!  Do two wrong copy/pastes make a right?  :-)  Yup, that's what I meant.

[commit-bot: I haz the power, 2012-04-30 14:13:37]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/10246007/19004

[commit-bot: I haz the power, 2012-04-30 16:54:51]

Change committed as 134543