Make EnvInputStateController owned by aura::Env.

ui/aura/env.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_AURA_ENV_H_
 #define UI_AURA_ENV_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 16 matching lines @@
 namespace ui {
 class ContextFactory;
 class ContextFactoryPrivate;
 class PlatformEventSource;
 }
 namespace aura {
 namespace test {
 class EnvTestHelper;
 }
 
+class EnvInputStateController;
 class EnvObserver;
 class InputStateLookup;
 class MusMouseLocationUpdater;
 class Window;
 class WindowPort;
 class WindowTreeClient;
 class WindowTreeHost;
 
 // A singleton object that tracks general state within Aura.
 class AURA_EXPORT Env : public ui::EventTarget,
@@ skipping 17 matching lines @@
   static Env* GetInstanceDontCreate();
 
   Mode mode() const { return mode_; }
 
   // Called internally to create the appropriate WindowPort implementation.
   std::unique_ptr<WindowPort> CreateWindowPort(Window* window);
 
   void AddObserver(EnvObserver* observer);
   void RemoveObserver(EnvObserver* observer);
 
+  EnvInputStateController* env_controller() const {
+    return env_controller_.get();
+  }
+
   int mouse_button_flags() const { return mouse_button_flags_; }
   void set_mouse_button_flags(int mouse_button_flags) {
     mouse_button_flags_ = mouse_button_flags;
   }
   // Returns true if a mouse button is down. This may query the native OS,
   // otherwise it uses |mouse_button_flags_|.
   bool IsMouseButtonDown() const;
 
   // Gets/sets the last mouse location seen in a mouse event in the screen
   // coordinates.
@@ skipping 59 matching lines @@
   // This is not const for tests, which may share Env across tests and so needs
   // to reset the value.
   Mode mode_;
 
   // Intentionally not exposed publicly. Someday we might want to support
   // multiple WindowTreeClients. Use EnvTestHelper in tests.
   WindowTreeClient* window_tree_client_ = nullptr;
 
   base::ObserverList<EnvObserver> observers_;
 
+  std::unique_ptr<EnvInputStateController> env_controller_;
   int mouse_button_flags_;
   // Location of last mouse event, in screen coordinates.
   mutable gfx::Point last_mouse_location_;
   bool is_touch_down_;
   bool get_last_mouse_location_from_mus_;
   // This may be set to true in tests to force using |last_mouse_location_|
   // rather than querying WindowTreeClient.
   bool always_use_last_mouse_location_ = false;
   // Whether we set ourselves as the OSExchangeDataProviderFactory.
   bool is_os_exchange_data_provider_factory_ = false;
 
   std::unique_ptr<InputStateLookup> input_state_lookup_;
   std::unique_ptr<ui::PlatformEventSource> event_source_;
 
 #if defined(USE_OZONE)
   // Factory for pixmaps that can use be transported from the client to the GPU
   // process using a low-level ozone-provided platform specific mechanism.
   std::unique_ptr<gfx::ClientNativePixmapFactory> native_pixmap_factory_;
 #endif
 
   ui::ContextFactory* context_factory_;
   ui::ContextFactoryPrivate* context_factory_private_;
 
   DISALLOW_COPY_AND_ASSIGN(Env);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_ENV_H_