Remove now-unnecessary wrappers around gfx::Screen::GetScreen()

chrome/browser/chromeos/net/network_portal_web_dialog.cc

 // Copyright 2014 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/net/network_portal_web_dialog.h"
 
-#include "ash/shell.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/captive_portal/captive_portal_detector.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/size.h"
+#include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 #include "url/gurl.h"
 
 namespace {
 
 const float kNetworkPortalWebDialogWidthFraction = .8;
 const float kNetworkPortalWebDialogHeightFraction = .8;
 
 gfx::Size GetPortalDialogSize() {
-  const gfx::Display display = ash::Shell::GetScreen()->GetPrimaryDisplay();
+  const gfx::Display display = gfx::Screen::GetScreen()->GetPrimaryDisplay();
 
   gfx::Size display_size = display.size();
 
   if (display.rotation() == gfx::Display::ROTATE_90 ||
       display.rotation() == gfx::Display::ROTATE_270) {
     display_size = gfx::Size(display_size.height(), display_size.width());
   }
 
   display_size =
       gfx::Size(display_size.width() * kNetworkPortalWebDialogWidthFraction,
@@ skipping 61 matching lines @@
 void NetworkPortalWebDialog::OnCloseContents(content::WebContents* /* source */,
                                              bool* out_close_dialog) {
   *out_close_dialog = true;
 }
 
 bool NetworkPortalWebDialog::ShouldShowDialogTitle() const {
   return true;
 }
 
 }  // namespace chromeos