Rename gfx::Display/Screen to display::Display/Screen in components

components/dom_distiller/content/browser/distiller_page_web_contents.cc

 // Copyright 2013 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 "components/dom_distiller/content/browser/distiller_page_web_contents.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/dom_distiller/content/browser/distiller_javascript_utils.h"
 #include "components/dom_distiller/content/browser/web_contents_main_frame_observer.h"
 #include "components/dom_distiller/core/distiller_page.h"
 #include "components/dom_distiller/core/dom_distiller_constants.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 #include "url/gurl.h"
 
 namespace dom_distiller {
 
 SourcePageHandleWebContents::SourcePageHandleWebContents(
     content::WebContents* web_contents,
     bool owned)
     : web_contents_(web_contents), owned_(owned) {
 }
 
@@ skipping 102 matching lines @@
 
 gfx::Size DistillerPageWebContents::GetSizeForNewRenderView(
     content::WebContents* web_contents) const {
   gfx::Size size(render_view_size_);
   if (size.IsEmpty())
     size = web_contents->GetContainerBounds().size();
   // If size is still empty, set it to fullscreen so that document.offsetWidth
   // in the executed domdistiller.js won't be 0.
   if (size.IsEmpty()) {
     DVLOG(1) << "Using fullscreen as default RenderView size";
-    size = gfx::Screen::GetScreen()->GetPrimaryDisplay().size();
+    size = display::Screen::GetScreen()->GetPrimaryDisplay().size();
   }
   return size;
 }
 
 void DistillerPageWebContents::DocumentLoadedInFrame(
     content::RenderFrameHost* render_frame_host) {
   if (render_frame_host ==
       source_page_handle_->web_contents()->GetMainFrame()) {
     ExecuteJavaScript();
   }
@@ skipping 44 matching lines @@
   if (!javascript_start.is_null()) {
     base::TimeDelta javascript_time = base::TimeTicks::Now() - javascript_start;
     UMA_HISTOGRAM_TIMES("DomDistiller.Time.RunJavaScript", javascript_time);
     DVLOG(1) << "DomDistiller.Time.RunJavaScript = " << javascript_time;
   }
 
   DistillerPage::OnDistillationDone(page_url, value);
 }
 
 }  // namespace dom_distiller