Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1154)

Unified Diff: mojo/examples/aura_demo/aura_demo.cc

Issue 121773003: Makes Window::Init take a WindowLayerType instead of LayerType. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge to master Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura_browsertest.cc ('k') | ui/aura/demo/demo_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/examples/aura_demo/aura_demo.cc
diff --git a/mojo/examples/aura_demo/aura_demo.cc b/mojo/examples/aura_demo/aura_demo.cc
index 2ac77cd5dc350918db84703c94160958d3dc8d57..54653005f9bcf9d92f8335026b92eb39bcc984cc 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_);
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura_browsertest.cc ('k') | ui/aura/demo/demo_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698