Excludes settings which uses Ash from Athena.

Excludes settings which uses Ash from Athena.

BUG=380213, 416961, 408734, 370175
R=stevenjb@chromium.org
TEST=manually

Committed: https://crrev.com/1b9d6565a40ef1fab60dd95e15660e4ac7d9f58f
Cr-Commit-Position: refs/heads/master@{#296354}

[Jun Mukai, 2014-09-23 20:11:53]

PTAL

Ccing oshima for display, bshe for wallpaper, antrim for lock-screen handling,
and dmazzoni for keyboard (accessibility).

[oshima, 2014-09-23 20:48:20]

oshima@chromium.org changed reviewers:
+ oshima@chromium.org

[oshima, 2014-09-23 20:48:21]

lgtm with nits

https://codereview.chromium.org/593273002/diff/1/chrome/browser/ui/webui/opti...
File chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
(right):

https://codereview.chromium.org/593273002/diff/1/chrome/browser/ui/webui/opti...
chrome/browser/ui/webui/options/chromeos/display_options_handler.cc:150: if
(ash::Shell::HasInstance())
can you use ifdef USE_ATHENA?

https://codereview.chromium.org/593273002/diff/1/chrome/browser/ui/webui/opti...
chrome/browser/ui/webui/options/chromeos/display_options_handler.cc:211:
base::FundamentalValue(ash::Shell::HasInstance()));
ditto

[Jun Mukai, 2014-09-23 20:50:59]

oops, poor misunderstanding, keyboard shortcuts are truly keyboard shortcut
overlay, not relevant to accessibility.

[Jun Mukai, 2014-09-23 20:52:38]

https://codereview.chromium.org/593273002/diff/1/chrome/browser/ui/webui/opti...
File chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
(right):

https://codereview.chromium.org/593273002/diff/1/chrome/browser/ui/webui/opti...
chrome/browser/ui/webui/options/chromeos/display_options_handler.cc:150: if
(ash::Shell::HasInstance())
On 2014/09/23 20:48:21, oshima wrote:
> can you use ifdef USE_ATHENA?

Done.

https://codereview.chromium.org/593273002/diff/1/chrome/browser/ui/webui/opti...
chrome/browser/ui/webui/options/chromeos/display_options_handler.cc:211:
base::FundamentalValue(ash::Shell::HasInstance()));
On 2014/09/23 20:48:21, oshima wrote:
> ditto

Done.

[stevenjb, 2014-09-23 20:55:03]

lgtm

[Jun Mukai, 2014-09-23 20:58:44]

mukai@chromium.org changed reviewers:
+ estade@chromium.org

[Jun Mukai, 2014-09-23 20:59:16]

mukai@chromium.org changed reviewers:
- estade@chromium.org

[Jun Mukai, 2014-09-23 20:59:20]

The CQ bit was checked by mukai@chromium.org

[commit-bot: I haz the power, 2014-09-23 21:03:23]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/593273002/20001

[commit-bot: I haz the power, 2014-09-24 03:06:11]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-09-24 03:06:12]

Exceeded time limit waiting for builds to trigger.

[Jun Mukai, 2014-09-24 05:15:35]

The CQ bit was checked by mukai@chromium.org

[commit-bot: I haz the power, 2014-09-24 05:15:59]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/593273002/20001

[commit-bot: I haz the power, 2014-09-24 05:44:43]

Committed patchset #2 (id:20001) as bd280a731e5a9d216f2cc4cef39dac6b909d728f

[commit-bot: I haz the power, 2014-09-24 05:45:30]

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