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

Unified Diff: ui/android/screen_android.cc

Issue 1409833004: Add DeviceDisplayInfo getter in WindowAndroid. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix failing bot, revert RWHVA changes, add NOTIMPLEMENTED to some functions in screen_android Created 4 years, 10 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
« no previous file with comments | « ui/android/screen_android.h ('k') | ui/android/ui_android.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/android/screen_android.cc
diff --git a/ui/android/screen_android.cc b/ui/android/screen_android.cc
new file mode 100644
index 0000000000000000000000000000000000000000..00d13896a9f8812603927904f960aa6b1634f180
--- /dev/null
+++ b/ui/android/screen_android.cc
@@ -0,0 +1,103 @@
+// Copyright 2016 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 "base/logging.h"
+#include "base/macros.h"
+#include "ui/android/screen_android.h"
+#include "ui/android/view_android.h"
+#include "ui/android/window_android.h"
+#include "ui/gfx/android/device_display_info.h"
+#include "ui/gfx/display.h"
+
+namespace ui {
+
+namespace {
+
+gfx::Display DisplayFromDeviceDisplayInfo(
+ const gfx::DeviceDisplayInfo& device_info) {
+ const float device_scale_factor = device_info.GetDIPScale();
+ // Note: GetPhysicalDisplayWidth/Height() does not subtract window
+ // decorations etc. Use it instead of GetDisplayWidth/Height() when
+ // available.
+ const gfx::Rect bounds_in_pixels =
+ gfx::Rect(device_info.GetPhysicalDisplayWidth()
+ ? device_info.GetPhysicalDisplayWidth()
+ : device_info.GetDisplayWidth(),
+ device_info.GetPhysicalDisplayHeight()
+ ? device_info.GetPhysicalDisplayHeight()
+ : device_info.GetDisplayHeight());
+ const gfx::Rect bounds_in_dip = gfx::Rect(gfx::ScaleToCeiledSize(
+ bounds_in_pixels.size(), 1.0f / device_scale_factor));
+ gfx::Display display(0, bounds_in_dip);
+ if (!gfx::Display::HasForceDeviceScaleFactor())
+ display.set_device_scale_factor(device_scale_factor);
+ display.SetRotationAsDegree(device_info.GetRotationDegrees());
+ return display;
+}
+
+} // namespace
+
+class ScreenAndroid : public gfx::Screen {
+ public:
+ ScreenAndroid() {}
+
+ gfx::Point GetCursorScreenPoint() override { return gfx::Point(); }
+
+ gfx::NativeWindow GetWindowUnderCursor() override {
+ NOTIMPLEMENTED();
+ return nullptr;
+ }
+
+ gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override {
+ NOTIMPLEMENTED();
+ return nullptr;
+ }
+
+ gfx::Display GetPrimaryDisplay() const override {
+ gfx::DeviceDisplayInfo device_info;
+ return DisplayFromDeviceDisplayInfo(device_info);
+ }
+
+ gfx::Display GetDisplayNearestWindow(gfx::NativeView view) const override {
+ if (view) {
+ return DisplayFromDeviceDisplayInfo(
+ view->GetWindowAndroid()->GetDeviceDisplayInfo());
+ }
+ return GetPrimaryDisplay();
+ }
+
+ gfx::Display GetDisplayNearestPoint(const gfx::Point& point) const override {
+ NOTIMPLEMENTED();
+ return gfx::Display();
+ }
+
+ int GetNumDisplays() const override { return 1; }
+
+ std::vector<gfx::Display> GetAllDisplays() const override {
+ NOTIMPLEMENTED();
+ return std::vector<gfx::Display>(1, GetPrimaryDisplay());
+ }
+
+ gfx::Display GetDisplayMatching(const gfx::Rect& match_rect) const override {
+ NOTIMPLEMENTED();
+ return gfx::Display();
+ }
+
+ void AddObserver(gfx::DisplayObserver* observer) override {
+ // no display change on Android.
+ }
+
+ void RemoveObserver(gfx::DisplayObserver* observer) override {
+ // no display change on Android.
+ }
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(ScreenAndroid);
+};
+
+gfx::Screen* CreateScreenAndroid() {
+ return new ScreenAndroid;
+}
+
+} // namespace ui
« no previous file with comments | « ui/android/screen_android.h ('k') | ui/android/ui_android.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698