diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 22:35:37 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 22:35:37 +0000 |
| commit | 2624482d1f03db2a6676e5dca21ad8f154cd1eeb (patch) | |
| tree | fa6823d27d1d49bdf24ce99faf84e66ac510fa40 /ui/aura | |
| parent | 585a639e9b73176eb5f7779bdfa594a6346e3fd7 (diff) | |
| download | chromium_src-2624482d1f03db2a6676e5dca21ad8f154cd1eeb.zip chromium_src-2624482d1f03db2a6676e5dca21ad8f154cd1eeb.tar.gz chromium_src-2624482d1f03db2a6676e5dca21ad8f154cd1eeb.tar.bz2 | |
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=jam@chromium.org
BUG=133312
Review URL: https://chromiumcodereview.appspot.com/11146023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163414 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura')
| -rw-r--r-- | ui/aura/test/aura_test_helper.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc index 04902f7..8267715 100644 --- a/ui/aura/test/aura_test_helper.cc +++ b/ui/aura/test/aura_test_helper.cc @@ -76,6 +76,7 @@ void AuraTestHelper::TearDown() { focus_manager_.reset(); root_window_.reset(); test_screen_.reset(); + gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL); aura::Env::DeleteInstance(); } |