mash: Fix launching touch hud app in mash mode.

ash/touch_hud/mus/touch_hud_application.cc

 // Copyright 2016 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 "ash/touch_hud/mus/touch_hud_application.h"
 
 #include "ash/public/interfaces/container.mojom.h"
 #include "ash/touch_hud/touch_hud_renderer.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 15 matching lines @@
 // receiving touch events from ui::WindowManagerConnection, it calls
 // ash::TouchHudRenderer to draw out touch points.
 class TouchHudUI : public views::WidgetDelegateView,
                    public views::PointerWatcher {
  public:
   TouchHudUI(views::WindowManagerConnection* window_manager_connection,
              views::Widget* widget)
       : window_manager_connection_(window_manager_connection),
         touch_hud_renderer_(new TouchHudRenderer(widget)) {
     window_manager_connection_->pointer_watcher_event_router()
-        ->AddPointerWatcher(this, false /* want_moves */);
+        ->AddPointerWatcher(this, true /* want_moves */);
   }
   ~TouchHudUI() override {
     window_manager_connection_->pointer_watcher_event_router()
         ->RemovePointerWatcher(this);
   }
 
  private:
   // Overridden from views::WidgetDelegate:
   views::View* GetContentsView() override { return this; }
   base::string16 GetWindowTitle() const override {
     // TODO(beng): use resources.
     return base::ASCIIToUTF16("TouchHud");
   }
 
   // Overridden from views::PointerWatcher:
   void OnPointerEventObserved(const ui::PointerEvent& event,
                               const gfx::Point& location_in_screen,
                               views::Widget* target) override {
     if (event.IsTouchPointerEvent())
       touch_hud_renderer_->HandleTouchEvent(event);
   }
 
   views::WindowManagerConnection* window_manager_connection_;
   TouchHudRenderer* touch_hud_renderer_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchHudUI);
 };
 
-TouchHudApplication::TouchHudApplication() : binding_(this) {}
+TouchHudApplication::TouchHudApplication() {}
 TouchHudApplication::~TouchHudApplication() {}
 
 void TouchHudApplication::OnStart(const shell::Identity& identity) {
   aura_init_.reset(new views::AuraInit(connector(), "views_mus_resources.pak"));
   window_manager_connection_ =
       views::WindowManagerConnection::Create(connector(), identity);
 }
 
 bool TouchHudApplication::OnConnect(const shell::Identity& remote_identity,
                                     shell::InterfaceRegistry* registry) {
@@ skipping 25 matching lines @@
     widget_->Init(params);
     widget_->Show();
   } else {
     widget_->Close();
     base::MessageLoop::current()->QuitWhenIdle();
   }
 }
 
 void TouchHudApplication::Create(const shell::Identity& remote_identity,
                                  mash::mojom::LaunchableRequest request) {
-  binding_.Bind(std::move(request));
+  bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace touch_hud
 }  // namespace ash