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

extensions/browser/api/web_contents_capture_client.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 "extensions/browser/api/web_contents_capture_client.h"
 
 #include "base/base64.h"
 #include "base/strings/stringprintf.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_function.h"
 #include "extensions/common/constants.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/codec/png_codec.h"
-#include "ui/gfx/display.h"
 #include "ui/gfx/geometry/size_conversions.h"
-#include "ui/gfx/screen.h"
 
 using content::RenderWidgetHost;
 using content::RenderWidgetHostView;
 using content::WebContents;
 
 namespace extensions {
 
 using api::extension_types::ImageDetails;
 
 bool WebContentsCaptureClient::CaptureAsync(
@@ skipping 28 matching lines @@
     OnCaptureFailure(FAILURE_REASON_VIEW_INVISIBLE);
     return false;
   }
 
   // By default, the requested bitmap size is the view size in screen
   // coordinates.  However, if there's more pixel detail available on the
   // current system, increase the requested bitmap size to capture it all.
   const gfx::Size view_size = view->GetViewBounds().size();
   gfx::Size bitmap_size = view_size;
   const gfx::NativeView native_view = view->GetNativeView();
-  gfx::Screen* const screen = gfx::Screen::GetScreen();
+  display::Screen* const screen = display::Screen::GetScreen();
   const float scale =
       screen->GetDisplayNearestWindow(native_view).device_scale_factor();
   if (scale > 1.0f)
     bitmap_size = gfx::ScaleToCeiledSize(view_size, scale);
 
   host->CopyFromBackingStore(gfx::Rect(view_size), bitmap_size, callback,
                              kN32_SkColorType);
   return true;
 }
 
@@ skipping 56 matching lines @@
                                      data.size());
 
   base::Base64Encode(stream_as_string, base64_result);
   base64_result->insert(
       0, base::StringPrintf("data:%s;base64,", mime_type.c_str()));
 
   return true;
 }
 
 }  // namespace extensions