Minimal support for OOBE/login for chrome-athena

athena/virtual_keyboard/virtual_keyboard_manager_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h"
 
 #include "athena/common/container_priorities.h"
 #include "athena/common/fill_layout_manager.h"
 #include "athena/screen/public/screen_manager.h"
 #include "base/bind.h"
@@ skipping 65 matching lines @@
     keyboard::KeyboardController::ResetInstance(NULL);
   }
 
  private:
   void Init() {
     athena::ScreenManager::ContainerParams params("VirtualKeyboardContainer",
                                                   CP_VIRTUAL_KEYBOARD);
     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);
 };
 
 }  // namespace
 
 // static
 VirtualKeyboardManager* VirtualKeyboardManager::Create(
     content::BrowserContext* browser_context) {
   CHECK(!instance);
@@ skipping 10 matching lines @@
   return instance;
 }
 
 void VirtualKeyboardManager::Shutdown() {
   CHECK(instance);
   delete instance;
   CHECK(!instance);
 }
 
 }  // namespace athena