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

Unified Diff: ui/android/edge_effect.h

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/animation_utils.h ('k') | ui/android/edge_effect.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/android/edge_effect.h
diff --git a/content/browser/android/edge_effect.h b/ui/android/edge_effect.h
similarity index 86%
rename from content/browser/android/edge_effect.h
rename to ui/android/edge_effect.h
index 587f1898c6475bc20dfacd7e7a49c1e188128684..de1bb15836f80fafcd406fee9a28e8fd171cec94 100644
--- a/content/browser/android/edge_effect.h
+++ b/ui/android/edge_effect.h
@@ -2,11 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_BROWSER_ANDROID_EDGE_EFFECT_H_
-#define CONTENT_BROWSER_ANDROID_EDGE_EFFECT_H_
+#ifndef UI_ANDROID_EDGE_EFFECT_H_
+#define UI_ANDROID_EDGE_EFFECT_H_
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
-#include "content/browser/android/edge_effect_base.h"
+#include "ui/android/edge_effect_base.h"
+#include "ui/android/ui_android_export.h"
namespace cc {
class Layer;
@@ -16,13 +18,13 @@ namespace ui {
class ResourceManager;
}
-namespace content {
+namespace ui {
// |EdgeEffect| mirrors its Android counterpart, EdgeEffect.java.
// Conscious tradeoffs were made to align this as closely as possible with the
// the original Android java version.
// All coordinates and dimensions are in device pixels.
-class EdgeEffect : public EdgeEffectBase {
+class UI_ANDROID_EXPORT EdgeEffect : public EdgeEffectBase {
public:
explicit EdgeEffect(ui::ResourceManager* resource_manager,
float device_scale_factor);
@@ -79,6 +81,6 @@ class EdgeEffect : public EdgeEffectBase {
DISALLOW_COPY_AND_ASSIGN(EdgeEffect);
};
-} // namespace content
+} // namespace ui
-#endif // CONTENT_BROWSER_ANDROID_EDGE_EFFECT_H_
+#endif // UI_ANDROID_EDGE_EFFECT_H_
« no previous file with comments | « ui/android/animation_utils.h ('k') | ui/android/edge_effect.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698