Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ash / shelf / shelf_window_watcher.h

diff --git a/src/ash/shelf/shelf_window_watcher.h b/src/ash/shelf/shelf_window_watcher.h
index 57b4ed2..cb99bc7 100644 (file)
--- a/src/ash/shelf/shelf_window_watcher.h
+++ b/src/ash/shelf/shelf_window_watcher.h
@@ -10,9 +10,9 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/scoped_observer.h"
-#include "ui/aura/client/activation_change_observer.h"
 #include "ui/aura/window_observer.h"
 #include "ui/gfx/display_observer.h"
+#include "ui/wm/public/activation_change_observer.h"
 
 namespace aura {
 
@@ -29,7 +29,6 @@ namespace ash {
 class ShelfModel;
 class ShelfItemDelegateManager;
 
-namespace internal {
 // ShelfWindowWatcher creates and handles a ShelfItem for windows that have
 // a ShelfItemDetails property in the default container.
 class ShelfWindowWatcher : public aura::client::ActivationChangeObserver,
@@ -144,7 +143,6 @@ class ShelfWindowWatcher : public aura::client::ActivationChangeObserver,
   DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher);
 };
 
-}  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_WINDOW_WATCHER_H_