ui/keyboard/keyboard_controller.cc - Issue 121773003: Makes Window::Init take a WindowLayerType instead of LayerType.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/keyboard/keyboard_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:

Index: ui/keyboard/keyboard_controller.cc

diff --git a/ui/keyboard/keyboard_controller.cc b/ui/keyboard/keyboard_controller.cc

index ca8e54fcc4af7d903c842c95e7e273516de48d62..6648a7883f6a72b07daed136211e3255fc6b4557 100644

--- a/ui/keyboard/keyboard_controller.cc

+++ b/ui/keyboard/keyboard_controller.cc

@@ -168,7 +168,7 @@ aura::Window* KeyboardController::GetContainerWindow() {

new KeyboardWindowDelegate(proxy_.get())));

container_->SetName("KeyboardContainer");

container_->set_owned_by_parent(false);

- container_->Init(ui::LAYER_NOT_DRAWN);

+ container_->Init(aura::WINDOW_LAYER_NOT_DRAWN);

container_->AddObserver(this);

container_->SetLayoutManager(new KeyboardLayoutManager(this));

}

« no previous file with comments | « ui/aura/window_unittest.cc ('k') | ui/keyboard/keyboard_controller_unittest.cc » ('j') | no next file with comments »