Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / athena / wm / window_list_provider_impl.h

diff --git a/src/athena/wm/window_list_provider_impl.h b/src/athena/wm/window_list_provider_impl.h
index 7d08a9d..1531ba4 100644 (file)
--- a/src/athena/wm/window_list_provider_impl.h
+++ b/src/athena/wm/window_list_provider_impl.h
@@ -6,6 +6,7 @@
 #define ATHENA_WM_WINDOW_LIST_PROVIDER_IMPL_H_
 
 #include "athena/wm/public/window_list_provider.h"
+#include "base/gtest_prod_util.h"
 #include "ui/aura/window_observer.h"
 
 namespace athena {
@@ -18,26 +19,28 @@ class ATHENA_EXPORT WindowListProviderImpl : public WindowListProvider,
                                              public aura::WindowObserver {
  public:
   explicit WindowListProviderImpl(aura::Window* container);
-  virtual ~WindowListProviderImpl();
+  ~WindowListProviderImpl() override;
 
- private:
-  void RecreateWindowList();
+  // TODO(oshima): Remove this method. This should live outside.
+  bool IsValidWindow(aura::Window* window) const;
 
   // WindowListProvider:
-  virtual void AddObserver(WindowListProviderObserver* observer) OVERRIDE;
-  virtual void RemoveObserver(WindowListProviderObserver* observer) OVERRIDE;
-  virtual const aura::Window::Windows& GetWindowList() const OVERRIDE;
-  virtual bool IsWindowInList(aura::Window* window) const OVERRIDE;
-  virtual bool IsValidWindow(aura::Window* window) const OVERRIDE;
-  virtual void StackWindowFrontOf(aura::Window* window,
-                                  aura::Window*reference_window) OVERRIDE;
-  virtual void StackWindowBehindTo(aura::Window* window,
-                                   aura::Window*reference_window) OVERRIDE;
+  void AddObserver(WindowListProviderObserver* observer) override;
+  void RemoveObserver(WindowListProviderObserver* observer) override;
+  const aura::Window::Windows& GetWindowList() const override;
+  bool IsWindowInList(aura::Window* window) const override;
+  void StackWindowFrontOf(aura::Window* window,
+                          aura::Window* reference_window) override;
+  void StackWindowBehindTo(aura::Window* window,
+                           aura::Window* reference_window) override;
+
+ private:
+  void RecreateWindowList();
 
   // aura::WindowObserver:
-  virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE;
-  virtual void OnWillRemoveWindow(aura::Window* old_window) OVERRIDE;
-  virtual void OnWindowStackingChanged(aura::Window* window) OVERRIDE;
+  void OnWindowAdded(aura::Window* new_window) override;
+  void OnWillRemoveWindow(aura::Window* old_window) override;
+  void OnWindowStackingChanged(aura::Window* window) override;
 
   aura::Window* container_;
   aura::Window::Windows window_list_;