diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 21:41:50 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 21:41:50 +0000 |
| commit | 52b02a76f71b14bd9623bf1581cb910b102e3ede (patch) | |
| tree | d6203c6049d2c4448a786af777534511789b60f2 /ash/shell_unittest.cc | |
| parent | 43c1f53f555da045e68bb217f787ba49c08ba2bc (diff) | |
| download | chromium_src-52b02a76f71b14bd9623bf1581cb910b102e3ede.zip chromium_src-52b02a76f71b14bd9623bf1581cb910b102e3ede.tar.gz chromium_src-52b02a76f71b14bd9623bf1581cb910b102e3ede.tar.bz2 | |
Makes Window::Init take a WindowLayerType instead of LayerType.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/121773003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_unittest.cc')
| -rw-r--r-- | ash/shell_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index 72a4524..203a38b 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -463,7 +463,7 @@ TEST_F(ShellTest, ToggleAutoHide) { scoped_ptr<aura::Window> window(new aura::Window(NULL)); window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); window->SetType(ui::wm::WINDOW_TYPE_NORMAL); - window->Init(ui::LAYER_TEXTURED); + window->Init(aura::WINDOW_LAYER_TEXTURED); ParentWindowInPrimaryRootWindow(window.get()); window->Show(); wm::ActivateWindow(window.get()); @@ -532,7 +532,7 @@ class ShellTest2 : public test::AshTestBase { TEST_F(ShellTest2, DontCrashWhenWindowDeleted) { window_.reset(new aura::Window(NULL)); - window_->Init(ui::LAYER_NOT_DRAWN); + window_->Init(aura::WINDOW_LAYER_NOT_DRAWN); } } // namespace ash |