Upstream chrome_content_browser_client

Upstream chrome_content_browser_client

BUG=561669
Committed: https://crrev.com/4f53ce4aa3373b96a72048682cba58e8a856ba70
Cr-Commit-Position: refs/heads/master@{#362145}

[bshe, 2015-11-25 16:53:54]

Description was changed from

==========
Upstream chrome_content_browser_client

BUG=
==========

to

==========
Upstream chrome_content_browser_client


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

[bshe, 2015-11-25 16:53:54]

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

[bshe, 2015-11-25 16:54:35]

Hi Mikhail.

Do you mind to take a look at this CL? It adds a bunch of ifdefs.

Thanks!

[bshe, 2015-11-25 19:43:52]

Description was changed from

==========
Upstream chrome_content_browser_client


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

to

==========
Upstream chrome_content_browser_client


BUG=561669
==========

[mfomitchev, 2015-11-25 22:31:20]

https://codereview.chromium.org/1473013005/diff/20001/chrome/browser/chrome_c...
File chrome/browser/chrome_content_browser_client.cc (right):

https://codereview.chromium.org/1473013005/diff/20001/chrome/browser/chrome_c...
chrome/browser/chrome_content_browser_client.cc:185: #if !defined(USE_AURA)
For includes and API declarations, I think sievers@ was suggesting we don't do
nested ifdefs ot make it easier to read

https://codereview.chromium.org/1473013005/diff/20001/chrome/browser/chrome_c...
chrome/browser/chrome_content_browser_client.cc:2638: #if (!defined(OS_ANDROID)
|| defined(USE_AURA)) && !defined(OS_IOS)
I wonder if it would be better to start using ANDROID_JAVA_UI that Dan is about
to land via this CL: https://codereview.chromium.org/1459793002/

[mfomitchev, 2015-11-25 22:31:39]

mfomitchev@chromium.org changed reviewers:
+ sievers@chromium.org

[bshe, 2015-11-26 15:22:20]

https://codereview.chromium.org/1473013005/diff/20001/chrome/browser/chrome_c...
File chrome/browser/chrome_content_browser_client.cc (right):

https://codereview.chromium.org/1473013005/diff/20001/chrome/browser/chrome_c...
chrome/browser/chrome_content_browser_client.cc:185: #if !defined(USE_AURA)
On 2015/11/25 22:31:20, mfomitchev wrote:
> For includes and API declarations, I think sievers@ was suggesting we don't do
> nested ifdefs ot make it easier to read

Done.

https://codereview.chromium.org/1473013005/diff/20001/chrome/browser/chrome_c...
chrome/browser/chrome_content_browser_client.cc:2638: #if (!defined(OS_ANDROID)
|| defined(USE_AURA)) && !defined(OS_IOS)
On 2015/11/25 22:31:20, mfomitchev wrote:
> I wonder if it would be better to start using ANDROID_JAVA_UI that Dan is
about
> to land via this CL: https://codereview.chromium.org/1459793002/

Added a TODO. I suspect if I try to land before his CL, I wont be able to commit
as it might break Android build? If this end up land after his CL, I will change
accordingly.

[mfomitchev, 2015-11-30 15:49:47]

LGTM

[bshe, 2015-11-30 16:09:40]

The CQ bit was checked by bshe@chromium.org

[commit-bot: I haz the power, 2015-11-30 16:10:18]

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

[commit-bot: I haz the power, 2015-11-30 16:56:39]

Description was changed from

==========
Upstream chrome_content_browser_client


BUG=561669
==========

to

==========
Upstream chrome_content_browser_client


BUG=561669
==========

[commit-bot: I haz the power, 2015-11-30 16:56:39]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2015-11-30 16:57:49]

Description was changed from

==========
Upstream chrome_content_browser_client


BUG=561669
==========

to

==========
Upstream chrome_content_browser_client

BUG=561669

Committed: https://crrev.com/4f53ce4aa3373b96a72048682cba58e8a856ba70
Cr-Commit-Position: refs/heads/master@{#362145}
==========

[commit-bot: I haz the power, 2015-11-30 16:57:51]

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