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

Unified Diff: content/browser/android/content_view_core_impl.cc

Issue 1411503005: Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file
Patch Set: Created 5 years, 2 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/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index 273d73e6af543418acd858a2dde8f1b36bc62fcf..0cbd56e061fcae4e5dea5eb230356d5ffebe8611 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -212,7 +212,7 @@ ContentViewCoreImpl::ContentViewCoreImpl(
root_layer_(cc::SolidColorLayer::Create(Compositor::LayerSettings())),
page_scale_(1),
view_android_(new ui::ViewAndroid(view_android_delegate, window_android)),
- dpi_scale_(ui::GetScaleFactorForNativeView(view_android_.get())),
+ dpi_scale_(1),
window_android_(window_android),
device_orientation_(0),
accessibility_enabled_(false) {
@@ -1295,9 +1295,11 @@ void ContentViewCoreImpl::SetAccessibilityEnabledInternal(bool enabled) {
}
void ContentViewCoreImpl::SendOrientationChangeEventInternal() {
+#if !defined(USE_AURA)
RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
if (rwhv)
rwhv->UpdateScreenInfo(GetViewAndroid());
+#endif
static_cast<WebContentsImpl*>(web_contents())->
screen_orientation_dispatcher_host()->OnOrientationChange();

Powered by Google App Engine
This is Rietveld 408576698