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

Unified Diff: ui/android/display_android_manager.cc

Issue 2688113002: Make ViewRoot the top of the ViewAndroid tree (Closed)
Patch Set: - Created 3 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
Index: ui/android/display_android_manager.cc
diff --git a/ui/android/display_android_manager.cc b/ui/android/display_android_manager.cc
index 5e467c6877ae9cb6aa2f4e523739d5a2cfc9bb42..4d5967e881ebd1a91573e0b3749b97c5d5756396 100644
--- a/ui/android/display_android_manager.cc
+++ b/ui/android/display_android_manager.cc
@@ -11,6 +11,7 @@
#include "base/stl_util.h"
#include "jni/DisplayAndroidManager_jni.h"
#include "ui/android/screen_android.h"
+#include "ui/android/view_android.h"
#include "ui/android/window_android.h"
#include "ui/display/display.h"
@@ -44,6 +45,11 @@ DisplayAndroidManager::~DisplayAndroidManager() {}
Display DisplayAndroidManager::GetDisplayNearestWindow(
gfx::NativeView view) const {
ui::WindowAndroid* window = view ? view->GetWindowAndroid() : nullptr;
+ return GetDisplayNearestWindowAndroid(window);
+}
+
+Display DisplayAndroidManager::GetDisplayNearestWindowAndroid(
+ gfx::NativeWindow window) const {
if (window) {
DisplayList::Displays::const_iterator it =
display_list().FindDisplayById(window->display_id());

Powered by Google App Engine
This is Rietveld 408576698