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

chrome/browser/chromeos/input_method/candidate_window.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 "chrome/browser/chromeos/input_method/candidate_window.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
+#include "ash/shell.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/observer_list.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/timer.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/input_method/candidate_view.h"
 #include "chrome/browser/chromeos/input_method/candidate_window_view.h"
@@ skipping 1188 matching lines @@
   // To avoid lookup-table overlapping, uses maximum y-position of mozc specific
   // location and cursor location, because mozc-engine does not consider about
   // multi-line composition.
   const int y = should_show_at_composition_head_?
       std::max(composition_head_location_.y(), cursor_location_.y()) :
       cursor_location_.y();
   const int height = cursor_location_.height();
   const int horizontal_offset = GetHorizontalOffset();
 
   gfx::Rect old_bounds = parent_frame_->GetClientAreaBoundsInScreen();
-  gfx::Rect screen_bounds =
-      gfx::Screen::GetDisplayMatching(cursor_location_).work_area();
+  gfx::Rect screen_bounds = ash::Shell::GetAshScreen()->GetDisplayMatching(
+      cursor_location_).work_area();
   // The size.
   gfx::Rect frame_bounds = old_bounds;
   frame_bounds.set_size(GetPreferredSize());
 
   // The default position.
   frame_bounds.set_x(x + horizontal_offset);
   frame_bounds.set_y(y + height);
 
   // Handle overflow at the left and the top.
   frame_bounds.set_x(std::max(frame_bounds.x(), screen_bounds.x()));
@@ skipping 273 matching lines @@
       infolist_row->Select();
     } else {
       infolist_row->Unselect();
     }
   }
 }
 
 void InfolistWindowView::ResizeAndMoveParentFrame() {
   int x, y;
   gfx::Rect old_bounds = parent_frame_->GetClientAreaBoundsInScreen();
-  gfx::Rect screen_bounds = gfx::Screen::GetDisplayNearestWindow(
+  gfx::Rect screen_bounds = ash::Shell::GetAshScreen()->GetDisplayNearestWindow(
       parent_frame_->GetNativeView()).work_area();
   // The size.
   gfx::Rect frame_bounds = old_bounds;
   gfx::Size size = GetPreferredSize();
   frame_bounds.set_size(size);
 
   gfx::Rect candidatewindow_bounds;
   if (candidate_window_frame_ != NULL) {
     candidatewindow_bounds =
         candidate_window_frame_->GetClientAreaBoundsInScreen();
@@ skipping 244 matching lines @@
 }
 
 // static
 CandidateWindowController*
 CandidateWindowController::CreateCandidateWindowController() {
   return new CandidateWindowControllerImpl;
 }
 
 }  // namespace input_method
 }  // namespace chromeos