Makes CaptureController be created and owned by WMState

ui/wm/core/capture_controller.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_WM_CORE_CAPTURE_CONTROLLER_H_
 #define UI_WM_CORE_CAPTURE_CONTROLLER_H_
 
 #include <map>
 
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/window_observer.h"
 #include "ui/wm/wm_export.h"
 
 namespace aura {
 namespace client {
 class CaptureDelegate;
 }
 }
 
 namespace wm {
 
 // Internal CaptureClient implementation. See ScopedCaptureClient for details.
 class WM_EXPORT CaptureController : public aura::client::CaptureClient {
  public:
+  CaptureController();
+  ~CaptureController() override;
+
+  static CaptureController* Get() { return instance_; }
+
   // Adds |root| to the list of root windows notified when capture changes.
   void Attach(aura::Window* root);
 
   // Removes |root| from the list of root windows notified when capture changes.
   void Detach(aura::Window* root);
 
   // Returns true if this CaptureController is installed on at least one
   // root window.
   bool is_active() const { return !delegates_.empty(); }
 
   // Overridden from aura::client::CaptureClient:
   void SetCapture(aura::Window* window) override;
   void ReleaseCapture(aura::Window* window) override;
   aura::Window* GetCaptureWindow() override;
   aura::Window* GetGlobalCaptureWindow() override;
   void AddObserver(aura::client::CaptureClientObserver* observer) override;
   void RemoveObserver(aura::client::CaptureClientObserver* observer) override;
 
  private:
   friend class ScopedCaptureClient;
 
-  CaptureController();
-  ~CaptureController() override;
+  static CaptureController* instance_;
 
   // The current capture window. NULL if there is no capture window.
   aura::Window* capture_window_;
 
   // The capture delegate for the root window with native capture. The root
   // window with native capture may not contain |capture_window_|. This occurs
   // if |capture_window_| is reparented to a different root window while it has
   // capture.
   aura::client::CaptureDelegate* capture_delegate_;
 
@@ skipping 21 matching lines @@
    private:
     // Not owned.
     ScopedCaptureClient* client_;
 
     DISALLOW_COPY_AND_ASSIGN(TestApi);
   };
 
   explicit ScopedCaptureClient(aura::Window* root);
   ~ScopedCaptureClient() override;
 
-  // Returns true if there is a CaptureController with at least one RootWindow.
-  static bool IsActive();
-
-  aura::client::CaptureClient* capture_client() {
-    return capture_controller_;
-  }
-
   // Overridden from aura::WindowObserver:
   void OnWindowDestroyed(aura::Window* window) override;
 
  private:
   // Invoked from destructor and OnWindowDestroyed() to cleanup.
   void Shutdown();
 
-  // The single CaptureController instance.
-  static CaptureController* capture_controller_;
-
   // RootWindow this ScopedCaptureClient was create for.
   aura::Window* root_window_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedCaptureClient);
 };
 
 }  // namespace wm
 
 #endif  // UI_WM_CORE_CAPTURE_CONTROLLER_H_