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

Unified Diff: content/browser/renderer_host/compositor_impl_android.cc

Issue 1419123002: android: move overscroll effects to ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix exports for component build 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/renderer_host/compositor_impl_android.cc
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index 96c864e2416d088e4f84ec39f0c5315c16ba0ffd..b83800b03420b63dedfcdaf9102f2f28494a47d9 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -179,9 +179,6 @@ class SingleThreadTaskGraphRunner
base::LazyInstance<SingleThreadTaskGraphRunner> g_task_graph_runner =
LAZY_INSTANCE_INITIALIZER;
-base::LazyInstance<cc::LayerSettings> g_layer_settings =
- LAZY_INSTANCE_INITIALIZER;
-
} // anonymous namespace
// static
@@ -199,12 +196,12 @@ void Compositor::Initialize() {
// static
const cc::LayerSettings& Compositor::LayerSettings() {
- return g_layer_settings.Get();
+ return ui::WindowAndroidCompositor::LayerSettings();
}
// static
void Compositor::SetLayerSettings(const cc::LayerSettings& settings) {
- g_layer_settings.Get() = settings;
+ ui::WindowAndroidCompositor::SetLayerSettings(settings);
}
// static

Powered by Google App Engine
This is Rietveld 408576698