diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-26 17:38:37 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-26 17:38:37 +0000 |
| commit | ab3b99de93676e6b18a0b58d2de141694c2ab79a (patch) | |
| tree | b9526db4870e590957f7582231fdb8be41184431 /ui/native_theme | |
| parent | bd6ab3db3f2ac6f387eb1515e1db6ac9d3d9d0fe (diff) | |
| download | chromium_src-ab3b99de93676e6b18a0b58d2de141694c2ab79a.zip chromium_src-ab3b99de93676e6b18a0b58d2de141694c2ab79a.tar.gz chromium_src-ab3b99de93676e6b18a0b58d2de141694c2ab79a.tar.bz2 | |
Disable menu experiment for Aura
The finch experiment of
https://chromiumcodereview.appspot.com/12549009
Causes aura windows to crash because the random folks refactoring
code are also subject of finch experiments, so for example this CL
https://chromiumcodereview.appspot.com/12483006
Broke us in debug on windows and gives random colors on release.
TBR=sky
BUG=157692
TEST=see bug
Review URL: https://codereview.chromium.org/13065003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190714 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/native_theme')
| -rw-r--r-- | ui/native_theme/native_theme.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/native_theme/native_theme.cc b/ui/native_theme/native_theme.cc index b9a2772..1e9a90f 100644 --- a/ui/native_theme/native_theme.cc +++ b/ui/native_theme/native_theme.cc @@ -27,6 +27,9 @@ void NativeTheme::SetScrollbarColors(unsigned inactive_color, // static bool NativeTheme::IsNewMenuStyleEnabled() { +#if defined(USE_AURA) + return true; +#else static bool enable_new_menu_style = !CommandLine::ForCurrentProcess()->HasSwitch( switches::kDisableNewMenuStyle); @@ -37,6 +40,7 @@ bool NativeTheme::IsNewMenuStyleEnabled() { kNewMenuStyleFieldTrialGroupName; } return enable_new_menu_style; +#endif } NativeTheme::NativeTheme() |