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

Unified Diff: athena/virtual_keyboard/virtual_keyboard_manager_impl.cc

Issue 542623002: Minimal support for OOBE/login for chrome-athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments resolved Created 6 years, 3 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
Index: athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
diff --git a/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc b/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
index 5b8c4ac2d1aa943d9e9427f6e253da2e7d651bb4..7a9fdf683fbf33c338fb6af229c6945d8e35a407 100644
--- a/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
+++ b/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
@@ -83,18 +83,18 @@ class VirtualKeyboardManagerImpl : public VirtualKeyboardManager {
container_ = athena::ScreenManager::Get()->CreateContainer(params);
container_->SetLayoutManager(new FillLayoutManager(container_));
- keyboard_controller_.reset(new keyboard::KeyboardController(
+ keyboard::KeyboardController* controller = new keyboard::KeyboardController(
new BasicKeyboardControllerProxy(browser_context_,
- container_->GetRootWindow())));
- keyboard::KeyboardController::ResetInstance(keyboard_controller_.get());
- aura::Window* kb_container = keyboard_controller_->GetContainerWindow();
+ container_->GetRootWindow()));
+ // ResetInstance takes ownership.
+ keyboard::KeyboardController::ResetInstance(controller);
+ aura::Window* kb_container = controller->GetContainerWindow();
container_->AddChild(kb_container);
kb_container->Show();
}
content::BrowserContext* browser_context_;
aura::Window* container_;
- scoped_ptr<keyboard::KeyboardController> keyboard_controller_;
DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardManagerImpl);
};

Powered by Google App Engine
This is Rietveld 408576698