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

chrome/browser/chromeos/extensions/file_manager_util.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/extensions/file_manager_util.h"
 
+#include "ash/shell.h"
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 498 matching lines @@
 
   Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord();
 
   FilePath virtual_path;
   if (!ConvertFileToRelativeFileSystemPath(profile, path, &virtual_path))
     return;
   std::string url = kActionChoiceUrl;
   url += "#/" + net::EscapeUrlEncodedData(virtual_path.value(), false);
   GURL dialog_url(url);
 
-  const gfx::Size screen = gfx::Screen::GetPrimaryDisplay().size();
+  const gfx::Size screen = ash::Shell::GetScreen()->GetPrimaryDisplay().size();
   const gfx::Rect bounds((screen.width() - kDialogWidth) / 2,
                          (screen.height() - kDialogHeight) / 2,
                          kDialogWidth,
                          kDialogHeight);
 
   Browser* browser = GetBrowserForUrl(dialog_url);
 
   if (!browser) {
     browser = new Browser(
         Browser::CreateParams::CreateForApp(Browser::TYPE_POPUP,
@@ skipping 275 matching lines @@
   scoped_ptr<ListValue> result_list(new ListValue());
   for (gdata::OperationProgressStatusList::const_iterator iter = list.begin();
        iter != list.end(); ++iter) {
     result_list->Append(
         ProgessStatusToDictionaryValue(profile, origin_url, *iter));
   }
   return result_list.release();
 }
 
 }  // namespace file_manager_util