Changes code using Compositor to pass in ContextFactory

ash/display/display_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 ASH_DISPLAY_DISPLAY_CONTROLLER_H_
 #define ASH_DISPLAY_DISPLAY_CONTROLLER_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 18 matching lines @@
 namespace base {
 class Value;
 template <typename T> class JSONValueConverter;
 }
 
 namespace gfx {
 class Display;
 class Insets;
 }
 
+namespace ui {
+class ContextFactory;
+}
+
 namespace ash {
 class AshWindowTreeHost;
 struct AshWindowTreeHostInitParams;
 class CursorWindowController;
 class DisplayInfo;
 class DisplayManager;
 class FocusActivationStore;
 class MirrorWindowController;
 class RootWindowController;
 class VirtualKeyboardWindowController;
@@ skipping 15 matching lines @@
     virtual void OnDisplayConfigurationChanging() {}
 
     // Invoked when the all display configuration changes
     // have been applied.
     virtual void OnDisplayConfigurationChanged() {};
 
    protected:
     virtual ~Observer() {}
   };
 
-  DisplayController();
+  explicit DisplayController(ui::ContextFactory* context_factory);
   virtual ~DisplayController();
 
   void Start();
   void Shutdown();
 
   // Returns primary display's ID.
   // TODO(oshima): Move this out from DisplayController;
   static int64 GetPrimaryDisplayId();
 
   CursorWindowController* cursor_window_controller() {
@@ skipping 103 matching lines @@
 
     bool IsThrottled() const;
 
    private:
     // The time when the throttling ends.
     base::Time throttle_timeout_;
 
     DISALLOW_COPY_AND_ASSIGN(DisplayChangeLimiter);
   };
 
+  ui::ContextFactory* context_factory_;
+
   // The limiter to throttle how fast a user can
   // change the display configuration.
   scoped_ptr<DisplayChangeLimiter> limiter_;
 
   typedef std::map<int64, AshWindowTreeHost*> WindowTreeHostMap;
   // The mapping from display ID to its window tree host.
   WindowTreeHostMap window_tree_hosts_;
 
   ObserverList<Observer> observers_;
 
@@ skipping 12 matching lines @@
   // restore the cursor location when display configuration
   // changed.
   gfx::Point cursor_location_in_native_coords_for_restore_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_CONTROLLER_H_