Makes Env contain a ContextFactory

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 "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "ui/aura/aura_export.h"
 #include "ui/events/event_handler.h"
 #include "ui/events/event_target.h"
 #include "ui/gfx/point.h"
 
 namespace ui {
+class ContextFactory;
 class PlatformEventSource;
 }
 namespace aura {
 
 namespace test {
 class EnvTestHelper;
 }
 
 class EnvObserver;
 class InputStateLookup;
@@ skipping 26 matching lines @@
   // coordinates.
   const gfx::Point& last_mouse_location() const { return last_mouse_location_; }
   void set_last_mouse_location(const gfx::Point& last_mouse_location) {
     last_mouse_location_ = last_mouse_location;
   }
 
   // Whether any touch device is currently down.
   bool is_touch_down() const { return is_touch_down_; }
   void set_touch_down(bool value) { is_touch_down_ = value; }
 
+  void set_context_factory(ui::ContextFactory* context_factory) {
+    context_factory_ = context_factory;
+  }
+  ui::ContextFactory* context_factory() { return context_factory_; }
+
  private:
   friend class test::EnvTestHelper;
   friend class Window;
   friend class WindowTreeHost;
 
   Env();
   virtual ~Env();
 
   // See description of CreateInstance() for deatils of |create_event_source|.
   void Init(bool create_event_source);
@@ skipping 16 matching lines @@
   ObserverList<EnvObserver> observers_;
 
   int mouse_button_flags_;
   // Location of last mouse event, in screen coordinates.
   gfx::Point last_mouse_location_;
   bool is_touch_down_;
 
   scoped_ptr<InputStateLookup> input_state_lookup_;
   scoped_ptr<ui::PlatformEventSource> event_source_;
 
+  ui::ContextFactory* context_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(Env);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_ENV_H_