diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 20:26:28 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 20:26:28 +0000 |
| commit | 5fdb45bd56f20aa4f103ee5a4b5a4d57b25b09d4 (patch) | |
| tree | 05ed908fccceb6138b0f14a6dd83693dd22a228e /ui/views/test | |
| parent | 8febf3c867fa3234af7df9a2a3fbe2a878ce328f (diff) | |
| download | chromium_src-5fdb45bd56f20aa4f103ee5a4b5a4d57b25b09d4.zip chromium_src-5fdb45bd56f20aa4f103ee5a4b5a4d57b25b09d4.tar.gz chromium_src-5fdb45bd56f20aa4f103ee5a4b5a4d57b25b09d4.tar.bz2 | |
Reland of "work on separate browser contexts"
A couple tests fixed up from http://codereview.chromium.org/11146023
Always start up in --desktop-aura mode now, and open ash from tools menu.
- 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=ben@chromium.org, jam@chromium.org
BUG=133312
Review URL: https://chromiumcodereview.appspot.com/11227057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/test')
| -rw-r--r-- | ui/views/test/test_views_delegate.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ui/views/test/test_views_delegate.cc b/ui/views/test/test_views_delegate.cc index 29d301d..e39258ba 100644 --- a/ui/views/test/test_views_delegate.cc +++ b/ui/views/test/test_views_delegate.cc @@ -7,9 +7,9 @@ #include "base/command_line.h" #include "base/logging.h" #include "content/public/test/web_contents_tester.h" -#include "ui/views/views_switches.h" #if defined(USE_AURA) && !defined(OS_CHROMEOS) +#include "ui/gfx/screen.h" #include "ui/views/widget/desktop_native_widget_aura.h" #endif @@ -72,10 +72,6 @@ NativeWidget* TestViewsDelegate::CreateNativeWidget( Widget::InitParams::Type type, internal::NativeWidgetDelegate* delegate, gfx::NativeView parent) { -#if defined(USE_AURA) && !defined(OS_CHROMEOS) - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDesktopAura)) - return new DesktopNativeWidgetAura(delegate); -#endif return NULL; } |