Changes code using Compositor to pass in ContextFactory

ui/aura/window_tree_host.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_WINDOW_TREE_HOST_H_
 #define UI_AURA_WINDOW_TREE_HOST_H_
 
 #include <vector>
 
 #include "base/event_types.h"
 #include "base/message_loop/message_loop.h"
 #include "ui/aura/aura_export.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/events/event_source.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
 class Insets;
 class Point;
 class Rect;
 class Size;
 class Transform;
 }
 
 namespace ui {
 class Compositor;
+class ContextFactory;
 class EventProcessor;
 class ViewProp;
 }
 
 namespace aura {
 namespace test {
 class WindowTreeHostTestApi;
 }
 
 class WindowEventDispatcher;
 class WindowTreeHostObserver;
 
 // WindowTreeHost bridges between a native window and the embedded RootWindow.
 // It provides the accelerated widget and maps events from the native os to
 // aura.
 class AURA_EXPORT WindowTreeHost {
  public:
   virtual ~WindowTreeHost();
 
   // Creates a new WindowTreeHost. The caller owns the returned value.
-  static WindowTreeHost* Create(const gfx::Rect& bounds);
+  static WindowTreeHost* Create(const gfx::Rect& bounds,
+                                ui::ContextFactory* context_factory);
 
   // Returns the WindowTreeHost for the specified accelerated widget, or NULL
   // if there is none associated.
   static WindowTreeHost* GetForAcceleratedWidget(gfx::AcceleratedWidget widget);
 
   void InitHost();
 
   void InitCompositor();
 
   void AddObserver(WindowTreeHostObserver* observer);
@@ skipping 87 matching lines @@
   // Called when the device scale factor of the root window has chagned.
   virtual void OnDeviceScaleFactorChanged(float device_scale_factor) = 0;
 
  protected:
   friend class TestScreen;  // TODO(beng): see if we can remove/consolidate.
 
   WindowTreeHost();
   void DestroyCompositor();
   void DestroyDispatcher();
 
-  void CreateCompositor(gfx::AcceleratedWidget accelerated_widget);
+  void CreateCompositor(gfx::AcceleratedWidget accelerated_widget,
+                        ui::ContextFactory* context_factory);
 
   // Returns the location of the RootWindow on native screen.
   virtual gfx::Point GetLocationOnNativeScreen() const = 0;
 
   void OnHostMoved(const gfx::Point& new_location);
   void OnHostResized(const gfx::Size& new_size);
   void OnHostCloseRequested();
   void OnHostActivated();
   void OnHostLostWindowCapture();
 
@@ skipping 31 matching lines @@
   gfx::Point last_cursor_request_position_in_host_;
 
   scoped_ptr<ui::ViewProp> prop_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHost);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_TREE_HOST_H_