Add context to gfx::Screen calls in support of simultaneous desktop+ash

ash/accelerators/accelerator_controller.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/accelerators/accelerator_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 
@@ skipping 107 matching lines @@
   } else if (shell->output_configurator()->connected_output_count() > 1) {
     internal::OutputConfiguratorAnimation* animation =
         shell->output_configurator_animation();
     animation->StartFadeOutAnimation(base::Bind(
         base::IgnoreResult(&chromeos::OutputConfigurator::CycleDisplayMode),
         base::Unretained(shell->output_configurator())));
   }
 }
 
 void HandleSwapPrimaryDisplay() {
-  if (gfx::Screen::GetNumDisplays() > 1) {
+  if (Shell::GetScreen()->GetNumDisplays() > 1) {
     Shell::GetInstance()->display_controller()->SetPrimaryDisplay(
         ScreenAsh::GetSecondaryDisplay());
   }
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 bool HandleExit() {
   ShellDelegate* delegate = Shell::GetInstance()->delegate();
   if (!delegate)
@@ skipping 743 matching lines @@
     accelerators_.insert(
         std::make_pair(accelerator, accelerators[i].action));
   }
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash