projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git]
/
src
/
ash
/
shelf
/
background_animator.h
diff --git
a/src/ash/shelf/background_animator.h
b/src/ash/shelf/background_animator.h
index
805f7d5
..
37be3be
100644
(file)
--- a/
src/ash/shelf/background_animator.h
+++ b/
src/ash/shelf/background_animator.h
@@
-18,8
+18,6
@@
enum BackgroundAnimatorChangeType {
BACKGROUND_CHANGE_IMMEDIATE
};
BACKGROUND_CHANGE_IMMEDIATE
};
-namespace internal {
-
// Delegate is notified any time the background changes.
class ASH_EXPORT BackgroundAnimatorDelegate {
public:
// Delegate is notified any time the background changes.
class ASH_EXPORT BackgroundAnimatorDelegate {
public:
@@
-69,7
+67,6
@@
class ASH_EXPORT BackgroundAnimator : public gfx::AnimationDelegate {
DISALLOW_COPY_AND_ASSIGN(BackgroundAnimator);
};
DISALLOW_COPY_AND_ASSIGN(BackgroundAnimator);
};
-} // namespace internal
} // namespace ash
#endif // ASH_SHELF_BACKGROUND_ANIMATOR_H_
} // namespace ash
#endif // ASH_SHELF_BACKGROUND_ANIMATOR_H_