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

Unified Diff: ui/android/overscroll_glow.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/edge_effect_l.cc ('k') | ui/android/overscroll_glow.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/android/overscroll_glow.h
diff --git a/content/browser/android/overscroll_glow.h b/ui/android/overscroll_glow.h
similarity index 91%
rename from content/browser/android/overscroll_glow.h
rename to ui/android/overscroll_glow.h
index 1736ae7be59ccd733ca1ae3a88c11232b2c837e9..4a40c97227d200bad4effad61b6490917faf2b1e 100644
--- a/content/browser/android/overscroll_glow.h
+++ b/ui/android/overscroll_glow.h
@@ -2,13 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_BROWSER_ANDROID_OVERSCROLL_GLOW_H_
-#define CONTENT_BROWSER_ANDROID_OVERSCROLL_GLOW_H_
+#ifndef UI_ANDROID_OVERSCROLL_GLOW_H_
+#define UI_ANDROID_OVERSCROLL_GLOW_H_
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
-#include "content/browser/android/edge_effect_base.h"
+#include "ui/android/edge_effect_base.h"
+#include "ui/android/ui_android_export.h"
#include "ui/gfx/geometry/size_f.h"
#include "ui/gfx/geometry/vector2d_f.h"
@@ -16,10 +18,10 @@ namespace cc {
class Layer;
}
-namespace content {
+namespace ui {
// Provides lazy, customized EdgeEffect creation.
-class OverscrollGlowClient {
+class UI_ANDROID_EXPORT OverscrollGlowClient {
public:
virtual ~OverscrollGlowClient() {}
@@ -31,7 +33,7 @@ class OverscrollGlowClient {
* Conscious tradeoffs were made to align this as closely as possible with the
* original Android Java version.
*/
-class OverscrollGlow {
+class UI_ANDROID_EXPORT OverscrollGlow {
public:
// |client| must be valid for the duration of the effect's lifetime.
// The effect is enabled by default, but will remain dormant until the first
@@ -105,6 +107,6 @@ class OverscrollGlow {
DISALLOW_COPY_AND_ASSIGN(OverscrollGlow);
};
-} // namespace content
+} // namespace ui
-#endif // CONTENT_BROWSER_ANDROID_OVERSCROLL_GLOW_H_
+#endif // UI_ANDROID_OVERSCROLL_GLOW_H_
« no previous file with comments | « ui/android/edge_effect_l.cc ('k') | ui/android/overscroll_glow.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698