Per discussion with mal, recognize the stable branch (parent regkey...

Per discussion with mal, recognize the stable branch (parent regkey
present but no 'ap' child).  Also made recognizing beta/dev a touch
more general.

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

[John Grabowski, 2010-01-08 23:04:14]

Tested with both installed dev and stable.

[Finnur, 2010-01-09 00:03:01]

LG, but one word of caution...

http://codereview.chromium.org/534005/diff/2001/2002
File chrome/common/platform_util_win.cc (right):

http://codereview.chromium.org/534005/diff/2001/2002#newcode200
chrome/common/platform_util_win.cc:200: else if (update_branch.find(L"dev") !=
std::wstring::npos)
We added the minus in front so that we wouldn't parse for example Evil Knievel's
special "2.0-beta daredevil" code as dev.

[John Grabowski, 2010-01-09 00:59:44]

http://codereview.chromium.org/534005/diff/2001/2002
File chrome/common/platform_util_win.cc (right):

http://codereview.chromium.org/534005/diff/2001/2002#newcode200
chrome/common/platform_util_win.cc:200: else if (update_branch.find(L"dev") !=
std::wstring::npos)
On 2010/01/09 00:03:01, Finnur wrote:
> We added the minus in front so that we wouldn't parse for example Evil
Knievel's
> special "2.0-beta daredevil" code as dev.

I was trying to avoid future surprises for new branch names (e.g. without the
-), but I guess it's not possible to plan for all possible cases.  Added the -
back in.

[TVL, 2010-01-09 01:26:46]

On 2010/01/09 00:59:44, John Grabowski wrote:
> http://codereview.chromium.org/534005/diff/2001/2002
> File chrome/common/platform_util_win.cc (right):
> 
> http://codereview.chromium.org/534005/diff/2001/2002#newcode200
> chrome/common/platform_util_win.cc:200: else if (update_branch.find(L"dev") !=
> std::wstring::npos)
> On 2010/01/09 00:03:01, Finnur wrote:
> > We added the minus in front so that we wouldn't parse for example Evil
> Knievel's
> > special "2.0-beta daredevil" code as dev.
> 
> I was trying to avoid future surprises for new branch names (e.g. without the
> -), but I guess it's not possible to plan for all possible cases.  Added the -
> back in.

I know mac no longer uses "2.0-dev", and just uses "dev".  You might want to
check with mal/laforge if they made this change on windows also since the
numbers were out of date.

[John Grabowski, 2010-01-09 01:33:44]

I tested latest dev which still uses "2.0-dev" and confirmed we print "dev"
in the about box.

jrg

On Fri, Jan 8, 2010 at 5:26 PM, <thomasvl@chromium.org> wrote:

> On 2010/01/09 00:59:44, John Grabowski wrote:
>
>> http://codereview.chromium.org/534005/diff/2001/2002
>> File chrome/common/platform_util_win.cc (right):
>>
>
>  http://codereview.chromium.org/534005/diff/2001/2002#newcode200
>> chrome/common/platform_util_win.cc:200: else if
>> (update_branch.find(L"dev") !=
>> std::wstring::npos)
>> On 2010/01/09 00:03:01, Finnur wrote:
>> > We added the minus in front so that we wouldn't parse for example Evil
>> Knievel's
>> > special "2.0-beta daredevil" code as dev.
>>
>
>  I was trying to avoid future surprises for new branch names (e.g. without
>> the
>> -), but I guess it's not possible to plan for all possible cases.  Added
>> the -
>> back in.
>>
>
> I know mac no longer uses "2.0-dev", and just uses "dev".  You might want
> to
> check with mal/laforge if they made this change on windows also since the
> numbers were out of date.
>
>
> http://codereview.chromium.org/534005
>