Introduce aura::Env controller to abstract away changes to aura::Env

ui/aura/window_event_dispatcher.h

 // 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.
 
 #ifndef UI_AURA_WINDOW_EVENT_DISPATCHER_H_
 #define UI_AURA_WINDOW_EVENT_DISPATCHER_H_
 
-#include <stdint.h>
-
 #include <memory>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/scoped_observer.h"
 #include "ui/aura/aura_export.h"
@@ skipping 18 matching lines @@
 class GestureEvent;
 class GestureRecognizer;
 class KeyEvent;
 class MouseEvent;
 class ScrollEvent;
 class TouchEvent;
 }
 
 namespace aura {
 class TestScreen;
+class EnvInputStateController;
 class WindowTargeter;
 class WindowTreeHost;
 
 namespace test {
 class WindowEventDispatcherTestApi;
 }
 
 // WindowEventDispatcher orchestrates event dispatch within a window tree
 // owned by WindowTreeHost. WTH also owns the WED.
 // TODO(beng): In progress, remove functionality not directly related to
@@ skipping 181 matching lines @@
 
   ui::EventDispatchDetails PreDispatchLocatedEvent(Window* target,
                                                    ui::LocatedEvent* event);
   ui::EventDispatchDetails PreDispatchMouseEvent(Window* target,
                                                  ui::MouseEvent* event);
   ui::EventDispatchDetails PreDispatchTouchEvent(Window* target,
                                                  ui::TouchEvent* event);
 
   WindowTreeHost* host_;
 
-  // Touch ids that are currently down.
-  uint32_t touch_ids_down_;
-
   Window* mouse_pressed_handler_;
   Window* mouse_moved_handler_;
   Window* event_dispatch_target_;
   Window* old_dispatch_target_;
 
   bool synthesize_mouse_move_;
 
   // How many move holds are outstanding. We try to defer dispatching
   // touch/mouse moves while the count is > 0.
   int move_hold_count_;
   // The location of |held_move_event_| is in |window_|'s coordinate.
   std::unique_ptr<ui::LocatedEvent> held_move_event_;
 
   // Allowing for reposting of events. Used when exiting context menus.
   std::unique_ptr<ui::LocatedEvent> held_repostable_event_;
 
   // Set when dispatching a held event.
   ui::LocatedEvent* dispatching_held_event_;
 
   ScopedObserver<aura::Window, aura::WindowObserver> observer_manager_;
 
   bool transform_events_;
 
+  std::unique_ptr<EnvInputStateController> env_controller_;
+
   // Used to schedule reposting an event.
   base::WeakPtrFactory<WindowEventDispatcher> repost_event_factory_;
 
   // Used to schedule DispatchHeldEvents() when |move_hold_count_| goes to 0.
   base::WeakPtrFactory<WindowEventDispatcher> held_event_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowEventDispatcher);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_EVENT_DISPATCHER_H_