Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1202)

Unified Diff: content/browser/devtools/protocol/color_picker.cc

Issue 2317563004: Change blink::WebScreenInfo to content::ScreenInfo (Closed)
Patch Set: Fix Windows compile Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/devtools/protocol/color_picker.cc
diff --git a/content/browser/devtools/protocol/color_picker.cc b/content/browser/devtools/protocol/color_picker.cc
index ed57b6c954cd99a57d92d06313214afa53b1df50..18faba861a57a1d3a456425d8485b7e9755e9bd6 100644
--- a/content/browser/devtools/protocol/color_picker.cc
+++ b/content/browser/devtools/protocol/color_picker.cc
@@ -9,8 +9,8 @@
#include "content/browser/renderer_host/render_view_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
#include "content/common/cursors/webcursor.h"
+#include "content/public/common/screen_info.h"
#include "third_party/WebKit/public/platform/WebCursorInfo.h"
-#include "third_party/WebKit/public/platform/WebScreenInfo.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkPaint.h"
@@ -165,9 +165,9 @@ void ColorPicker::UpdateCursor() {
const float kPixelSize = 10;
#endif
- blink::WebScreenInfo screen_info;
- host_->GetWebScreenInfo(&screen_info);
- double device_scale_factor = screen_info.deviceScaleFactor;
+ content::ScreenInfo screen_info;
+ host_->GetScreenInfo(&screen_info);
+ double device_scale_factor = screen_info.device_scale_factor;
SkBitmap result;
result.allocN32Pixels(kCursorSize * device_scale_factor,

Powered by Google App Engine
This is Rietveld 408576698