Upstrem prefs changes

Upstrem prefs changes

BUG=507792
Committed: https://crrev.com/1cffacd8f05734fae20c8816c3fc91abac5e38d4
Cr-Commit-Position: refs/heads/master@{#363233}

[bshe, 2015-12-02 18:37:47]

Patchset #2 (id:20001) has been deleted

[bshe, 2015-12-02 18:44:02]

bshe@chromium.org changed reviewers:
+ battre@chromium.org

[bshe, 2015-12-02 18:44:02]

Hi battre.
Do you mind to take a look at this CL? I enabled some prefs for Aura Android.
Thanks!

[bshe, 2015-12-03 22:08:08]

On 2015/12/02 18:44:02, bshe wrote:
> Hi battre.
> Do you mind to take a look at this CL? I enabled some prefs for Aura Android.
> Thanks!

friendly ping?

[battre, 2015-12-04 10:55:34]

https://codereview.chromium.org/1487693002/diff/60001/chrome/browser/prefs/in...
File chrome/browser/prefs/incognito_mode_prefs.cc (right):

https://codereview.chromium.org/1487693002/diff/60001/chrome/browser/prefs/in...
chrome/browser/prefs/incognito_mode_prefs.cc:221: 
the previous branch is less specific (USE_AURA) than this one (OS_ANDROID &&
USE_AURA). It will never be triggered.

[battre, 2015-12-04 10:57:37]

LGTM when the comment is resolved.

[bshe, 2015-12-04 14:56:55]

Thanks!

https://codereview.chromium.org/1487693002/diff/60001/chrome/browser/prefs/in...
File chrome/browser/prefs/incognito_mode_prefs.cc (right):

https://codereview.chromium.org/1487693002/diff/60001/chrome/browser/prefs/in...
chrome/browser/prefs/incognito_mode_prefs.cc:221: 
On 2015/12/04 10:55:34, battre wrote:
> the previous branch is less specific (USE_AURA) than this one (OS_ANDROID &&
> USE_AURA). It will never be triggered.

deleted. I was using elif instead of nested ifdef in the "elif
defined(OS_ANDROID)". But later decide to use nested ifdef as the code is only a
few lines and still readable. This elif was a left over from my last attempt and
should be removed. sorry.

[bshe, 2015-12-04 15:34:34]

The CQ bit was checked by bshe@chromium.org

[bshe, 2015-12-04 15:34:34]

The patchset sent to the CQ was uploaded after l-g-t-m from battre@chromium.org
Link to the patchset: https://codereview.chromium.org/1487693002/#ps80001
(title: "reviews")

[commit-bot: I haz the power, 2015-12-04 15:35:42]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1487693002/80001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1487693002/80001

[commit-bot: I haz the power, 2015-12-04 16:54:30]

Committed patchset #4 (id:80001)

[commit-bot: I haz the power, 2015-12-04 16:55:18]

Description was changed from

==========
Upstrem prefs changes


BUG=507792
==========

to

==========
Upstrem prefs changes

BUG=507792

Committed: https://crrev.com/1cffacd8f05734fae20c8816c3fc91abac5e38d4
Cr-Commit-Position: refs/heads/master@{#363233}
==========

[commit-bot: I haz the power, 2015-12-04 16:55:18]

Patchset 4 (id:??) landed as
https://crrev.com/1cffacd8f05734fae20c8816c3fc91abac5e38d4
Cr-Commit-Position: refs/heads/master@{#363233}

[bshe, 2016-01-05 16:09:37]

A revert of this CL (patchset #4 id:80001) has been created in
https://codereview.chromium.org/1558183002/ by bshe@chromium.org.

The reason for reverting is: We dont need to support Aura Android at current
stage. Revert related code..