Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / frame / desktop_browser_frame_aura.h

diff --git a/src/chrome/browser/ui/views/frame/desktop_browser_frame_aura.h b/src/chrome/browser/ui/views/frame/desktop_browser_frame_aura.h
index 8818816..901fa3e 100644 (file)
--- a/src/chrome/browser/ui/views/frame/desktop_browser_frame_aura.h
+++ b/src/chrome/browser/ui/views/frame/desktop_browser_frame_aura.h
@@ -11,21 +11,13 @@
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
-class BrowserDesktopRootWindowHost;
+class BrowserDesktopWindowTreeHost;
 class BrowserFrame;
 class BrowserView;
 
-namespace aura {
-namespace client {
-class UserActionClient;
-}
-}
-
-namespace views {
-namespace corewm {
+namespace wm {
 class VisibilityController;
 }
-}
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopBrowserFrameAura
@@ -42,19 +34,20 @@ class DesktopBrowserFrameAura : public views::DesktopNativeWidgetAura,
   BrowserView* browser_view() const { return browser_view_; }
 
  protected:
-  virtual ~DesktopBrowserFrameAura();
+  ~DesktopBrowserFrameAura() override;
 
   // Overridden from views::DesktopNativeWidgetAura:
-  virtual void OnHostClosed() OVERRIDE;
-  virtual void InitNativeWidget(
-      const views::Widget::InitParams& params) OVERRIDE;
+  void OnHostClosed() override;
+  void InitNativeWidget(const views::Widget::InitParams& params) override;
 
   // Overridden from NativeBrowserFrame:
-  virtual views::NativeWidget* AsNativeWidget() OVERRIDE;
-  virtual const views::NativeWidget* AsNativeWidget() const OVERRIDE;
-  virtual bool UsesNativeSystemMenu() const OVERRIDE;
-  virtual int GetMinimizeButtonOffset() const OVERRIDE;
-  virtual void TabStripDisplayModeChanged() OVERRIDE;
+  views::NativeWidget* AsNativeWidget() override;
+  const views::NativeWidget* AsNativeWidget() const override;
+  bool UsesNativeSystemMenu() const override;
+  int GetMinimizeButtonOffset() const override;
+  bool ShouldSaveWindowPlacement() const override;
+  void GetWindowPlacement(gfx::Rect* bounds,
+                          ui::WindowShowState* show_state) const override;
 
  private:
   // The BrowserView is our ClientView. This is a pointer to it.
@@ -62,10 +55,9 @@ class DesktopBrowserFrameAura : public views::DesktopNativeWidgetAura,
   BrowserFrame* browser_frame_;
 
   // Owned by the RootWindow.
-  BrowserDesktopRootWindowHost* browser_desktop_root_window_host_;
+  BrowserDesktopWindowTreeHost* browser_desktop_window_tree_host_;
 
-  scoped_ptr<aura::client::UserActionClient> user_action_client_;
-  scoped_ptr<views::corewm::VisibilityController> visibility_controller_;
+  scoped_ptr<wm::VisibilityController> visibility_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopBrowserFrameAura);
 };