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
/
desktop_background
/
desktop_background_widget_controller.cc
diff --git
a/src/ash/desktop_background/desktop_background_widget_controller.cc
b/src/ash/desktop_background/desktop_background_widget_controller.cc
index
ca2fd03
..
4a19538
100644
(file)
--- a/
src/ash/desktop_background/desktop_background_widget_controller.cc
+++ b/
src/ash/desktop_background/desktop_background_widget_controller.cc
@@
-15,7
+15,6
@@
#include "ui/views/widget/widget_observer.h"
namespace ash {
-namespace internal {
namespace {
class ShowWallpaperAnimationObserver : public ui::ImplicitAnimationObserver,
@@
-144,5
+143,4
@@
DesktopBackgroundWidgetController* AnimatingDesktopController::GetController(
return controller_.get();
}
-} // namespace internal
} // namespace ash