Remove the keyboard from the browser demo.

examples/browser/browser.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 "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "examples/window_manager/window_manager.mojom.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/common/common_type_converters.h"
@@ skipping 40 matching lines @@
     gfx::Size ps = text_field->GetPreferredSize();
     text_field->SetBoundsRect(gfx::Rect(host->width(), ps.height()));
   }
   virtual gfx::Size GetPreferredSize(const views::View* host) const override {
     return gfx::Size();
   }
 
   DISALLOW_COPY_AND_ASSIGN(BrowserLayoutManager);
 };
 
-// KeyboardManager handles notifying the windowmanager when views are focused.
-// To use create one and KeyboardManager will take care of all other details.
-//
-// TODO(sky): it would be nice if this were put in NativeWidgetViewManager, but
-// that requires NativeWidgetViewManager to take an IWindowManager. That may be
-// desirable anyway...
-class KeyboardManager
-    : public views::FocusChangeListener,
-      public ui::EventHandler,
-      public views::WidgetObserver {
- public:
-  KeyboardManager(views::Widget* widget,
-                  IWindowManager* window_manager,
-                  View* view)
-      : widget_(widget),
-        window_manager_(window_manager),
-        view_(view),
-        last_view_id_(0),
-        focused_view_(NULL) {
-    widget_->GetFocusManager()->AddFocusChangeListener(this);
-    widget_->AddObserver(this);
-    widget_->GetNativeView()->AddPostTargetHandler(this);
-  }
-
- private:
-  virtual ~KeyboardManager() {
-    widget_->GetFocusManager()->RemoveFocusChangeListener(this);
-    widget_->GetNativeView()->RemovePostTargetHandler(this);
-    widget_->RemoveObserver(this);
-
-    HideKeyboard();
-  }
-
-  void ShowKeyboard(views::View* view) {
-    if (focused_view_ == view)
-      return;
-
-    const gfx::Rect bounds_in_widget =
-        view->ConvertRectToWidget(gfx::Rect(view->bounds().size()));
-    last_view_id_ = view_->id();
-    window_manager_->ShowKeyboard(last_view_id_,
-                                  Rect::From(bounds_in_widget));
-    // TODO(sky): listen for view to be removed.
-    focused_view_ = view;
-  }
-
-  void HideKeyboard() {
-    if (!focused_view_)
-      return;
-
-    window_manager_->HideKeyboard(last_view_id_);
-    last_view_id_ = 0;
-    focused_view_ = NULL;
-  }
-
-  // views::FocusChangeListener:
-  virtual void OnWillChangeFocus(views::View* focused_before,
-                                 views::View* focused_now) override {
-  }
-  virtual void OnDidChangeFocus(views::View* focused_before,
-                                views::View* focused_now) override {
-    if (focused_view_ && focused_now != focused_view_)
-      HideKeyboard();
-  }
-
-  // ui::EventHandler:
-  virtual void OnMouseEvent(ui::MouseEvent* event) override {
-    views::View* focused_now = widget_->GetFocusManager()->GetFocusedView();
-    if (focused_now &&
-        focused_now->GetClassName() == views::Textfield::kViewClassName &&
-        (event->flags() & ui::EF_FROM_TOUCH) != 0) {
-      ShowKeyboard(focused_now);
-    }
-  }
-
-  // views::WidgetObserver:
-  virtual void OnWidgetDestroying(views::Widget* widget) override {
-    delete this;
-  }
-
-  views::Widget* widget_;
-  IWindowManager* window_manager_;
-  View* view_;
-  Id last_view_id_;
-  views::View* focused_view_;
-
-  DISALLOW_COPY_AND_ASSIGN(KeyboardManager);
-};
-
 // This is the basics of creating a views widget with a textfield.
 // TODO: cleanup!
 class Browser : public ApplicationDelegate,
                 public ViewManagerDelegate,
                 public views::TextfieldController,
                 public ViewObserver {
  public:
   Browser() : shell_(nullptr), root_(NULL), widget_(NULL) {}
 
   virtual ~Browser() {
@@ skipping 28 matching lines @@
     widget_delegate->GetContentsView()->SetLayoutManager(
         new BrowserLayoutManager);
 
     widget_ = new views::Widget;
     views::Widget::InitParams params(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.native_widget = new NativeWidgetViewManager(widget_, shell_, view);
     params.delegate = widget_delegate;
     params.bounds = gfx::Rect(view->bounds().width, view->bounds().height);
     widget_->Init(params);
-    // KeyboardManager handles deleting itself when the widget is destroyed.
-    new KeyboardManager(widget_, window_manager_.get(), view);
     widget_->Show();
     textfield->RequestFocus();
   }
 
   // ViewManagerDelegate:
   virtual void OnEmbed(View* root,
                        ServiceProviderImpl* exported_services,
                        scoped_ptr<ServiceProvider> imported_services) override {
     // TODO: deal with OnEmbed() being invoked multiple times.
     ConnectToService(imported_services.get(), &navigator_host_);
@@ skipping 53 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new mojo::examples::Browser);
   return runner.Run(shell_handle);
 }