Remove InputMethodBase log spam, let keyboard controller be null.

Do not construct a stub InputMethodKeyboardController, check for null.
Also cleanup StubInputController decl and use NOTIMPLEMENTED_LOG_ONCE.

Bug: 881475
Test: No functional changes, less debug log spam.
Change-Id: Ib8db1778f1ae09227bf559f1bb2fe6ac752649d2
Reviewed-on: https://chromium-review.googlesource.com/1222349Reviewed-by: Shu Chen <shuchen@chromium.org>
Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Reviewed-by: Ken Buchanan <kenrb@chromium.org>
Commit-Queue: Michael Wasserman <msw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592875}

chrome/browser/ui/views/location_bar/location_bar_view.cc

@@ -753,8 +753,8 @@ WebContents* LocationBarView::GetWebContentsForPageActionIconView() {
 // static
 bool LocationBarView::IsVirtualKeyboardVisible(views::Widget* widget) {
   if (auto* input_method = widget->GetInputMethod()) {
-    return input_method->GetInputMethodKeyboardController()
-        ->IsKeyboardVisible();
+    auto* keyboard = input_method->GetInputMethodKeyboardController();
+    return keyboard && keyboard->IsKeyboardVisible();
   }
   return false;
 }

chrome/browser/ui/views/omnibox/omnibox_view_views.cc

@@ -762,7 +762,8 @@ void OmniboxViewViews::ShowVirtualKeyboardIfEnabled() {
 
 void OmniboxViewViews::HideImeIfNeeded() {
   if (auto* input_method = GetInputMethod()) {
-    input_method->GetInputMethodKeyboardController()->DismissVirtualKeyboard();
+    if (auto* keyboard = input_method->GetInputMethodKeyboardController())
+      keyboard->DismissVirtualKeyboard();
   }
 }
 

content/browser/renderer_host/render_widget_host_view_aura.cc

@@ -758,7 +758,7 @@ void RenderWidgetHostViewAura::SetInsets(const gfx::Insets& insets) {
 void RenderWidgetHostViewAura::FocusedNodeTouched(bool editable) {
 #if defined(OS_WIN)
   auto* input_method = GetInputMethod();
-  if (!input_method)
+  if (!input_method || !input_method->GetInputMethodKeyboardController())
     return;
   auto* controller = input_method->GetInputMethodKeyboardController();
   if (editable && host()->GetView() && host()->delegate()) {
@@ -1736,7 +1736,7 @@ void RenderWidgetHostViewAura::FocusedNodeChanged(
   if (!editable && virtual_keyboard_requested_ && window_) {
     virtual_keyboard_requested_ = false;
 
-    if (input_method) {
+    if (input_method && input_method->GetInputMethodKeyboardController()) {
       input_method->GetInputMethodKeyboardController()
           ->DismissVirtualKeyboard();
     }

ui/base/ime/input_method_base.cc

@@ -129,7 +129,8 @@ bool InputMethodBase::GetClientShouldDoLearning() {
 void InputMethodBase::ShowVirtualKeyboardIfEnabled() {
   for (InputMethodObserver& observer : observer_list_)
     observer.OnShowVirtualKeyboardIfEnabled();
-  GetInputMethodKeyboardController()->DisplayVirtualKeyboard();
+  if (auto* keyboard = GetInputMethodKeyboardController())
+    keyboard->DisplayVirtualKeyboard();
 }
 
 void InputMethodBase::AddObserver(InputMethodObserver* observer) {
@@ -142,11 +143,6 @@ void InputMethodBase::RemoveObserver(InputMethodObserver* observer) {
 
 InputMethodKeyboardController*
 InputMethodBase::GetInputMethodKeyboardController() {
-  if (!keyboard_controller_) {
-    NOTIMPLEMENTED() << "Using InputMethodKeyboardControllerStub";
-    keyboard_controller_ =
-        std::make_unique<InputMethodKeyboardControllerStub>();
-  }
   return keyboard_controller_.get();
 }
 

ui/ozone/public/input_controller.cc

@@ -5,10 +5,8 @@
 #include "ui/ozone/public/input_controller.h"
 
 #include "base/callback.h"
-#include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/memory/ptr_util.h"
 
 namespace ui {
 
@@ -16,146 +14,55 @@ namespace {
 
 class StubInputController : public InputController {
  public:
-  StubInputController();
-  ~StubInputController() override;
+  StubInputController() = default;
+  ~StubInputController() override = default;
 
   // InputController:
-  bool HasMouse() override;
-  bool HasTouchpad() override;
-  bool IsCapsLockEnabled() override;
-  void SetCapsLockEnabled(bool enabled) override;
-  void SetNumLockEnabled(bool enabled) override;
-  bool IsAutoRepeatEnabled() override;
-  void SetAutoRepeatEnabled(bool enabled) override;
+  bool HasMouse() override { return false; }
+  bool HasTouchpad() override { return false; }
+  bool IsCapsLockEnabled() override { return false; }
+  void SetCapsLockEnabled(bool enabled) override {}
+  void SetNumLockEnabled(bool enabled) override {}
+  bool IsAutoRepeatEnabled() override { return true; }
+  void SetAutoRepeatEnabled(bool enabled) override {}
   void SetAutoRepeatRate(const base::TimeDelta& delay,
-                         const base::TimeDelta& interval) override;
+                         const base::TimeDelta& interval) override {}
   void GetAutoRepeatRate(base::TimeDelta* delay,
-                         base::TimeDelta* interval) override;
-  void SetCurrentLayoutByName(const std::string& layout_name) override;
-  void SetTouchEventLoggingEnabled(bool enabled) override;
-  void SetTouchpadSensitivity(int value) override;
-  void SetTapToClick(bool enabled) override;
-  void SetThreeFingerClick(bool enabled) override;
-  void SetTapDragging(bool enabled) override;
-  void SetNaturalScroll(bool enabled) override;
-  void SetMouseSensitivity(int value) override;
-  void SetPrimaryButtonRight(bool right) override;
-  void SetMouseReverseScroll(bool enabled) override;
-  void SetTapToClickPaused(bool state) override;
-  void GetTouchDeviceStatus(GetTouchDeviceStatusReply reply) override;
+                         base::TimeDelta* interval) override {}
+  void SetCurrentLayoutByName(const std::string& layout_name) override {}
+  void SetTouchEventLoggingEnabled(bool enabled) override {
+    NOTIMPLEMENTED_LOG_ONCE();
+  }
+  void SetTouchpadSensitivity(int value) override {}
+  void SetTapToClick(bool enabled) override {}
+  void SetThreeFingerClick(bool enabled) override {}
+  void SetTapDragging(bool enabled) override {}
+  void SetNaturalScroll(bool enabled) override {}
+  void SetMouseSensitivity(int value) override {}
+  void SetPrimaryButtonRight(bool right) override {}
+  void SetMouseReverseScroll(bool enabled) override {}
+  void SetTapToClickPaused(bool state) override {}
+  void GetTouchDeviceStatus(GetTouchDeviceStatusReply reply) override {
+    std::move(reply).Run(std::string());
+  }
   void GetTouchEventLog(const base::FilePath& out_dir,
-                        GetTouchEventLogReply reply) override;
-  void SetInternalTouchpadEnabled(bool enabled) override;
-  bool IsInternalTouchpadEnabled() const override;
-  void SetTouchscreensEnabled(bool enabled) override;
+                        GetTouchEventLogReply reply) override {
+    std::move(reply).Run(std::vector<base::FilePath>());
+  }
+  void SetInternalTouchpadEnabled(bool enabled) override {}
+  bool IsInternalTouchpadEnabled() const override { return false; }
+  void SetTouchscreensEnabled(bool enabled) override {}
   void SetInternalKeyboardFilter(bool enable_filter,
-                                 std::vector<DomCode> allowed_keys) override;
+                                 std::vector<DomCode> allowed_keys) override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(StubInputController);
 };
 
-StubInputController::StubInputController() {
-}
-
-StubInputController::~StubInputController() {
-}
-
-bool StubInputController::HasMouse() {
-  return false;
-}
-
-bool StubInputController::HasTouchpad() {
-  return false;
-}
-
-bool StubInputController::IsCapsLockEnabled() {
-  return false;
-}
-
-void StubInputController::SetCapsLockEnabled(bool enabled) {
-}
-
-void StubInputController::SetNumLockEnabled(bool enabled) {
-}
-
-bool StubInputController::IsAutoRepeatEnabled() {
-  return true;
-}
-
-void StubInputController::SetAutoRepeatEnabled(bool enabled) {
-}
-
-void StubInputController::SetAutoRepeatRate(const base::TimeDelta& delay,
-                                            const base::TimeDelta& interval) {
-}
-
-void StubInputController::GetAutoRepeatRate(base::TimeDelta* delay,
-                                            base::TimeDelta* interval) {
-}
-
-void StubInputController::SetCurrentLayoutByName(
-    const std::string& layout_name) {}
-
-void StubInputController::SetTouchpadSensitivity(int value) {
-}
-
-void StubInputController::SetTouchEventLoggingEnabled(bool enabled) {
-  NOTIMPLEMENTED();
-}
-
-void StubInputController::SetTapToClick(bool enabled) {
-}
-
-void StubInputController::SetThreeFingerClick(bool enabled) {
-}
-
-void StubInputController::SetTapDragging(bool enabled) {
-}
-
-void StubInputController::SetNaturalScroll(bool enabled) {
-}
-
-void StubInputController::SetMouseSensitivity(int value) {
-}
-
-void StubInputController::SetPrimaryButtonRight(bool right) {
-}
-
-void StubInputController::SetMouseReverseScroll(bool enabled) {
-}
-
-void StubInputController::SetTapToClickPaused(bool state) {
-}
-
-void StubInputController::GetTouchDeviceStatus(
-    GetTouchDeviceStatusReply reply) {
-  std::move(reply).Run(std::string());
-}
-
-void StubInputController::GetTouchEventLog(const base::FilePath& out_dir,
-                                           GetTouchEventLogReply reply) {
-  std::move(reply).Run(std::vector<base::FilePath>());
-}
-
-void StubInputController::SetInternalTouchpadEnabled(bool enabled) {
-}
-
-bool StubInputController::IsInternalTouchpadEnabled() const {
-  return false;
-}
-
-void StubInputController::SetTouchscreensEnabled(bool enabled) {}
-
-void StubInputController::SetInternalKeyboardFilter(
-    bool enable_filter,
-    std::vector<DomCode> allowed_keys) {
-}
-
 }  // namespace
 
 std::unique_ptr<InputController> CreateStubInputController() {
-  return base::WrapUnique(new StubInputController);
+  return std::make_unique<StubInputController>();
 }
 
 }  // namespace ui