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

Unified Diff: ash/shell/keyboard_controller_proxy_stub.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/shelf/shelf_layout_manager_unittest.cc ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/keyboard_controller_proxy_stub.cc
diff --git a/ash/shell/keyboard_controller_proxy_stub.cc b/ash/shell/keyboard_controller_proxy_stub.cc
index 556e7aa4f1ef534374b49dff1b188191c47b5854..1e50ca6c92259727e4e5dc322e1c663370ba3a54 100644
--- a/ash/shell/keyboard_controller_proxy_stub.cc
+++ b/ash/shell/keyboard_controller_proxy_stub.cc
@@ -22,7 +22,7 @@ KeyboardControllerProxyStub::~KeyboardControllerProxyStub() {
aura::Window* KeyboardControllerProxyStub::GetKeyboardWindow() {
if (!keyboard_) {
keyboard_.reset(new aura::Window(&delegate_));
- keyboard_->Init(ui::LAYER_NOT_DRAWN);
+ keyboard_->Init(aura::WINDOW_LAYER_NOT_DRAWN);
}
return keyboard_.get();
}
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698