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

Unified Diff: ash/root_window_controller.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 | « ash/drag_drop/drag_drop_tracker.cc ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 65414fddd2db4d7e2cac4a45b9dca1e8160a209e..ac607c5f0bbd151615db06d51ac15abcab4aecb5 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -92,7 +92,7 @@ aura::Window* CreateContainer(int window_id,
aura::Window* container = new aura::Window(NULL);
container->set_id(window_id);
container->SetName(name);
- container->Init(ui::LAYER_NOT_DRAWN);
+ container->Init(aura::WINDOW_LAYER_NOT_DRAWN);
parent->AddChild(container);
if (window_id != internal::kShellWindowId_UnparentedControlContainer)
container->Show();
@@ -721,7 +721,7 @@ void RootWindowController::InitLayoutManagers() {
// This window exists only to be a event target on login screen.
// It does not have to handle events, nor be visible.
mouse_event_target_.reset(new aura::Window(new EmptyWindowDelegate));
- mouse_event_target_->Init(ui::LAYER_NOT_DRAWN);
+ mouse_event_target_->Init(aura::WINDOW_LAYER_NOT_DRAWN);
aura::Window* lock_background_container =
GetContainer(internal::kShellWindowId_LockScreenBackgroundContainer);
« no previous file with comments | « ash/drag_drop/drag_drop_tracker.cc ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698