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 /mojo/examples | |
| 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 'mojo/examples')
| -rw-r--r-- | mojo/examples/aura_demo/aura_demo.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mojo/examples/aura_demo/aura_demo.cc b/mojo/examples/aura_demo/aura_demo.cc index 24f0a75..cb744d6 100644 --- a/mojo/examples/aura_demo/aura_demo.cc +++ b/mojo/examples/aura_demo/aura_demo.cc @@ -148,21 +148,21 @@ class AuraDemo : public ShellClient { delegate1_.reset(new DemoWindowDelegate(SK_ColorBLUE)); window1_ = new aura::Window(delegate1_.get()); - window1_->Init(ui::LAYER_TEXTURED); + window1_->Init(aura::WINDOW_LAYER_TEXTURED); window1_->SetBounds(gfx::Rect(100, 100, 400, 400)); window1_->Show(); root_window_->window()->AddChild(window1_); delegate2_.reset(new DemoWindowDelegate(SK_ColorRED)); window2_ = new aura::Window(delegate2_.get()); - window2_->Init(ui::LAYER_TEXTURED); + window2_->Init(aura::WINDOW_LAYER_TEXTURED); window2_->SetBounds(gfx::Rect(200, 200, 350, 350)); window2_->Show(); root_window_->window()->AddChild(window2_); delegate21_.reset(new DemoWindowDelegate(SK_ColorGREEN)); window21_ = new aura::Window(delegate21_.get()); - window21_->Init(ui::LAYER_TEXTURED); + window21_->Init(aura::WINDOW_LAYER_TEXTURED); window21_->SetBounds(gfx::Rect(10, 10, 50, 50)); window21_->Show(); window2_->AddChild(window21_); |