diff options
| author | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 15:50:37 +0000 |
|---|---|---|
| committer | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 15:50:37 +0000 |
| commit | 7308f63c2e468c5867a2f678b38729daaf1cb466 (patch) | |
| tree | 29e17b96862d800d05d96707ab002a79958ea133 /content/shell | |
| parent | 7c89eaaeee37e2ae6d308af0eab7141ac8e03fa7 (diff) | |
| download | chromium_src-7308f63c2e468c5867a2f678b38729daaf1cb466.zip chromium_src-7308f63c2e468c5867a2f678b38729daaf1cb466.tar.gz chromium_src-7308f63c2e468c5867a2f678b38729daaf1cb466.tar.bz2 | |
Revert 163414 - Always start up in --desktop-aura mode now, and open ash from tools menu.
(This broke win_aura on main waterfall.)
- Implement host_desktop.cc and plumb a few places that need context to determine which style of desktop it belongs to.
- Remove --desktop-aura, --open-ash, --enable-ash
TBR=jam@chromium.org
BUG=133312
Review URL: https://chromiumcodereview.appspot.com/11146023
TBR=scottmg@chromium.org
Review URL: https://codereview.chromium.org/11230058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163563 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/shell_aura.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/content/shell/shell_aura.cc b/content/shell/shell_aura.cc index 956bc7f..7e1a1e8 100644 --- a/content/shell/shell_aura.cc +++ b/content/shell/shell_aura.cc @@ -26,6 +26,7 @@ #include "ui/views/layout/grid_layout.h" #include "ui/views/view.h" #include "ui/views/test/test_views_delegate.h" +#include "ui/views/views_switches.h" #include "ui/views/widget/desktop_native_widget_aura.h" #include "ui/views/widget/desktop_native_widget_helper_aura.h" #include "ui/views/widget/widget.h" @@ -291,6 +292,8 @@ void Shell::PlatformInitialize() { gfx::Screen::SetScreenInstance( gfx::SCREEN_TYPE_NATIVE, aura::CreateDesktopScreen()); views_delegate_ = new ShellViewsDelegateAura(); + + CommandLine::ForCurrentProcess()->AppendSwitch(views::switches::kDesktopAura); } void Shell::PlatformExit() { |