Implement and test aura::client::CaptureClient in views::NativeWidgetMus for plumbing (Set|Release)…

ui/views/mus/native_widget_mus.cc

 // Copyright 2015 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/views/mus/native_widget_mus.h"
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 420 matching lines @@
   ui::PlatformWindowDelegate* platform_window_delegate() {
     return native_widget_mus_->window_tree_host();
   }
 
   NativeWidgetMus* native_widget_mus_;
   mus::mojom::ShowState show_state_;
 
   DISALLOW_COPY_AND_ASSIGN(MusWindowObserver);
 };
 
+class NativeWidgetMus::MusCaptureClient : public aura::client::CaptureClient {

[sadrul, 2016/05/24 15:25:19]

This could subclass DefaultCaptureClient instead, and override the bits it needs
to, instead of overriding everything, right?

[Mark Dittmer, 2016/05/24 16:06:20]

Should work.

+ public:
+  MusCaptureClient(aura::Window* root_window, aura::Window* aura_window,
+                   mus::Window* mus_window)
+      : aura_window_(aura_window), mus_window_(mus_window),
+        delegate_(new aura::client::DefaultCaptureClient(root_window)) {
+    SetCaptureClient(root_window, this);
+  }
+  ~MusCaptureClient() override {}
+
+  void SetCapture(aura::Window* window) override {

[sadrul, 2016/05/24 15:25:19]

// aura::client::CaptureClient:

[Mark Dittmer, 2016/05/24 16:06:20]

Done (against aura::client::DefaultCaptureClient).

+    delegate()->SetCapture(window);
+    if (aura_window_ == window)
+      mus_window_->SetCapture();
+  }
+  void ReleaseCapture(aura::Window* window) override {
+    delegate()->ReleaseCapture(window);
+    if (aura_window_ == window)
+      mus_window_->ReleaseCapture();
+  }
+  aura::Window* GetCaptureWindow() override {
+    return delegate()->GetCaptureWindow();
+  }
+  aura::Window* GetGlobalCaptureWindow() override {
+    return delegate()->GetGlobalCaptureWindow();
+  }
+
+ private:
+  aura::client::CaptureClient* delegate() { return delegate_.get(); }
+
+  aura::Window* aura_window_;
+  mus::Window* mus_window_;
+  std::unique_ptr<aura::client::DefaultCaptureClient> delegate_;

[sadrul, 2016/05/24 15:25:19]

DISALLOW_COPY_AND_ASSIGN

[Mark Dittmer, 2016/05/24 16:06:20]

Done.

+};
+
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetMus, public:
 
 NativeWidgetMus::NativeWidgetMus(internal::NativeWidgetDelegate* delegate,
                                  shell::Connector* connector,
                                  mus::Window* window,
                                  mus::mojom::SurfaceType surface_type)
     : window_(window),
       last_cursor_(mus::mojom::Cursor::CURSOR_NULL),
       native_widget_delegate_(delegate),
@@ skipping 187 matching lines @@
     aura::client::SetCursorClient(window_tree_host_->window(),
                                   cursor_manager_.get());
   }
 
   window_tree_client_.reset(
       new NativeWidgetMusWindowTreeClient(window_tree_host_->window()));
   window_tree_host_->window()->AddPreTargetHandler(focus_client_.get());
   window_tree_host_->window()->SetLayoutManager(
       new ContentWindowLayoutManager(window_tree_host_->window(), content_));
   capture_client_.reset(
-      new aura::client::DefaultCaptureClient(window_tree_host_->window()));
+      new MusCaptureClient(window_tree_host_->window(), content_, window_));
 
   content_->SetType(ui::wm::WINDOW_TYPE_NORMAL);
   content_->Init(ui::LAYER_TEXTURED);
   if (window_->visible())
     content_->Show();
   content_->SetTransparent(true);
   content_->SetFillsBoundsCompletely(false);
   window_tree_host_->window()->AddChild(content_);
 
   // Set-up transiency if appropriate.
@@ skipping 649 matching lines @@
     window_tree_host_->Show();
     GetNativeWindow()->Show();
   } else {
     window_tree_host_->Hide();
     GetNativeWindow()->Hide();
   }
   native_widget_delegate_->OnNativeWidgetVisibilityChanged(window->visible());
 }
 
 }  // namespace views