Only show virtual keyboard on primary root window

ui/keyboard/keyboard_controller.cc

 // Copyright (c) 2013 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 "ui/keyboard/keyboard_controller.h"
 
 #include "base/bind.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
@@ skipping 111 matching lines @@
 
 KeyboardController::KeyboardController(KeyboardControllerProxy* proxy)
     : proxy_(proxy),
       container_(NULL),
       input_method_(NULL),
       keyboard_visible_(false),
       weak_factory_(this) {
   CHECK(proxy);
   input_method_ = proxy_->GetInputMethod();
   input_method_->AddObserver(this);
+  container_ = new aura::Window(new KeyboardWindowDelegate());
+  container_->SetName("KeyboardContainer");
+  container_->Init(ui::LAYER_NOT_DRAWN);
+  container_->AddObserver(this);
+  container_->SetLayoutManager(new KeyboardLayoutManager(container_));

[sadrul, 2013/10/03 15:26:28]

Is this change necessary?

[bshe, 2013/10/03 15:57:13]

dooh. noop. It was from one of my experimental refactor. It is not necessary
with this patch. I will move it back.

On 2013/10/03 15:26:28, sadrul wrote:

[bshe, 2013/10/04 00:58:08]

Done.

 }
 
 KeyboardController::~KeyboardController() {
   if (container_)
     container_->RemoveObserver(this);
   if (input_method_)
     input_method_->RemoveObserver(this);
 }
 
 aura::Window* KeyboardController::GetContainerWindow() {
-  if (!container_) {
-    container_ = new aura::Window(new KeyboardWindowDelegate());
-    container_->SetName("KeyboardContainer");
-    container_->Init(ui::LAYER_NOT_DRAWN);
-    container_->AddObserver(this);
-    container_->SetLayoutManager(new KeyboardLayoutManager(container_));
-  }
   return container_;
 }
 
 void KeyboardController::HideKeyboard() {
   keyboard_visible_ = false;
 
   FOR_EACH_OBSERVER(KeyboardControllerObserver,
                     observer_list_,
                     OnKeyboardBoundsChanging(gfx::Rect()));
 
@@ skipping 74 matching lines @@
     const ui::InputMethod* input_method) {
   DCHECK_EQ(input_method_, input_method);
   input_method_ = NULL;
 }
 
 bool KeyboardController::WillHideKeyboard() const {
   return weak_factory_.HasWeakPtrs();
 }
 
 }  // namespace keyboard