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

Unified Diff: ui/android/delegated_frame_host_android.cc

Issue 2688413007: Add display::GetDisplayNearestView (Closed)
Patch Set: add missing files 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/delegated_frame_host_android.cc
diff --git a/ui/android/delegated_frame_host_android.cc b/ui/android/delegated_frame_host_android.cc
index 2f31c5a1b8955638d8f28565bc91611eacdc8bb1..3d5d291977830fffe04a6ca57d2840d6335bf95d 100644
--- a/ui/android/delegated_frame_host_android.cc
+++ b/ui/android/delegated_frame_host_android.cc
@@ -196,8 +196,10 @@ void DelegatedFrameHostAndroid::UpdateBackgroundColor(SkColor color) {
void DelegatedFrameHostAndroid::UpdateContainerSizeinDIP(
const gfx::Size& size_in_dip) {
container_size_in_dip_ = size_in_dip;
- float device_scale_factor = display::Screen::GetScreen()
- ->GetDisplayNearestWindow(view_).device_scale_factor();
+ float device_scale_factor =
+ display::Screen::GetScreen()
+ ->GetDisplayNearestWindow(view_->GetWindowAndroid())
+ .device_scale_factor();
background_layer_->SetBounds(
gfx::ConvertSizeToPixel(device_scale_factor, container_size_in_dip_));
UpdateBackgroundLayer();
@@ -238,8 +240,10 @@ void DelegatedFrameHostAndroid::UpdateBackgroundLayer() {
bool background_is_drawable = false;
if (current_frame_) {
- float device_scale_factor = display::Screen::GetScreen()
- ->GetDisplayNearestWindow(view_).device_scale_factor();
+ float device_scale_factor =
+ display::Screen::GetScreen()
+ ->GetDisplayNearestWindow(view_->GetWindowAndroid())
+ .device_scale_factor();
gfx::Size content_size_in_dip = gfx::ConvertSizeToDIP(
device_scale_factor, current_frame_->surface_size);
background_is_drawable =

Powered by Google App Engine
This is Rietveld 408576698