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

Unified Diff: ui/android/edge_effect.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
« no previous file with comments | « ui/android/edge_effect.h ('k') | ui/android/edge_effect_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/android/edge_effect.cc
diff --git a/content/browser/android/edge_effect.cc b/ui/android/edge_effect.cc
similarity index 97%
rename from content/browser/android/edge_effect.cc
rename to ui/android/edge_effect.cc
index df84c3f277517eaac89415baefd9618c92d735d3..86579e3edd5849fc4504f6b95c55a9568d681dc7 100644
--- a/content/browser/android/edge_effect.cc
+++ b/ui/android/edge_effect.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/browser/android/edge_effect.h"
+#include "ui/android/edge_effect.h"
#include "cc/layers/layer.h"
#include "cc/layers/ui_resource_layer.h"
-#include "content/browser/android/animation_utils.h"
-#include "content/public/browser/android/compositor.h"
+#include "ui/android/animation_utils.h"
#include "ui/android/resources/resource_manager.h"
#include "ui/android/resources/system_ui_resource_type.h"
+#include "ui/android/window_android_compositor.h"
-namespace content {
+namespace ui {
namespace {
@@ -64,8 +64,8 @@ class EdgeEffect::EffectLayer {
public:
EffectLayer(ui::SystemUIResourceType resource_type,
ui::ResourceManager* resource_manager)
- : ui_resource_layer_(
- cc::UIResourceLayer::Create(Compositor::LayerSettings())),
+ : ui_resource_layer_(cc::UIResourceLayer::Create(
+ WindowAndroidCompositor::LayerSettings())),
resource_type_(resource_type),
resource_manager_(resource_manager) {}
@@ -357,4 +357,4 @@ void EdgeEffect::PreloadResources(ui::ResourceManager* resource_manager) {
kGlowResourceId);
}
-} // namespace content
+} // namespace ui
« no previous file with comments | « ui/android/edge_effect.h ('k') | ui/android/edge_effect_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698