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

ash/display/shared_display_edge_indicator.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/display/shared_display_edge_indicator.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 38 matching lines @@
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
   params.transparent = true;
   params.can_activate = false;
   params.keep_on_top = true;
   widget->set_focus_on_creation(false);
   widget->Init(params);
   widget->SetVisibilityChangedAnimationsEnabled(false);
   widget->GetNativeWindow()->SetName("SharedEdgeIndicator");
   widget->SetContentsView(contents_view);
-  gfx::Display display = gfx::Screen::GetDisplayMatching(bounds);
+  gfx::Display display = Shell::GetScreen()->GetDisplayMatching(bounds);
   aura::Window* window = widget->GetNativeWindow();
   aura::client::ScreenPositionClient* screen_position_client =
       aura::client::GetScreenPositionClient(window->GetRootWindow());
   screen_position_client->SetBounds(window, bounds, display);
   widget->Show();
   return widget;
 }
 
 }  // namespace
 
@@ skipping 34 matching lines @@
   SkColor color = SkColorSetARGB(0xFF, value, value, value);
   if (src_indicator_)
     static_cast<IndicatorView*>(src_indicator_)->SetColor(color);
   if (dst_indicator_)
     static_cast<IndicatorView*>(dst_indicator_)->SetColor(color);
 
 }
 
 }  // namespace internal
 }  // namespace ash