Changes code using Compositor to pass in ContextFactory

ash/shell.cc

 // 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.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/accelerator_controller.h"
@@ skipping 150 matching lines @@
       bool visible) OVERRIDE {
     return AnimateOnChildWindowVisibilityChanged(window, visible);
   }
 
   DISALLOW_COPY_AND_ASSIGN(AshVisibilityController);
 };
 
 AshWindowTreeHostInitParams ShellInitParamsToAshWindowTreeHostInitParams(
     const ShellInitParams& shell_init_params) {
   AshWindowTreeHostInitParams ash_init_params;
+  ash_init_params.context_factory = shell_init_params.context_factory;
 #if defined(OS_WIN)
   ash_init_params.remote_hwnd = shell_init_params.remote_hwnd;
 #endif
   return ash_init_params;
 }
 
 }  // namespace
 
 // static
 Shell* Shell::instance_ = NULL;
 // static
 bool Shell::initially_hide_cursor_ = false;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, public:
 
 // static
 Shell* Shell::CreateInstance(const ShellInitParams& init_params) {
   CHECK(!instance_);
-  instance_ = new Shell(init_params.delegate);
+  instance_ = new Shell(init_params.delegate, init_params.context_factory);
   instance_->Init(init_params);
   return instance_;
 }
 
 // static
 Shell* Shell::GetInstance() {
   DCHECK(instance_);
   return instance_;
 }
 
@@ skipping 409 matching lines @@
 #endif  // defined(OS_CHROMEOS)
 
 void Shell::DoInitialWorkspaceAnimation() {
   return GetPrimaryRootWindowController()->workspace_controller()->
       DoInitialAnimation();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, private:
 
-Shell::Shell(ShellDelegate* delegate)
+Shell::Shell(ShellDelegate* delegate, ui::ContextFactory* context_factory)
     : target_root_window_(NULL),
       scoped_target_root_window_(NULL),
       delegate_(delegate),
       window_positioner_(new WindowPositioner),
       activation_client_(NULL),
       accelerometer_controller_(new AccelerometerController()),
 #if defined(OS_CHROMEOS)
       display_configurator_(new ui::DisplayConfigurator()),
 #endif  // defined(OS_CHROMEOS)
       native_cursor_manager_(new AshNativeCursorManager),
       cursor_manager_(
           scoped_ptr< ::wm::NativeCursorManager>(native_cursor_manager_)),
       simulate_modal_window_open_for_testing_(false),
       is_touch_hud_projection_enabled_(false) {
   DCHECK(delegate_.get());
   gpu_support_.reset(delegate_->CreateGPUSupport());
   display_manager_.reset(new DisplayManager);
-  display_controller_.reset(new DisplayController);
+  display_controller_.reset(new DisplayController(context_factory));
 #if defined(OS_CHROMEOS) && defined(USE_X11)
   user_metrics_recorder_.reset(new UserMetricsRecorder);
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(OS_CHROMEOS)
   PowerStatus::Initialize();
 #endif
 }
 
 Shell::~Shell() {
@@ skipping 494 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, aura::client::ActivationChangeObserver implementation:
 
 void Shell::OnWindowActivated(aura::Window* gained_active,
                               aura::Window* lost_active) {
   if (gained_active)
     target_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash