Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / apps / native_app_window_cocoa.h

diff --git a/src/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h b/src/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
index 06b3730..018f05f 100644 (file)
--- a/src/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
+++ b/src/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
@@ -51,26 +51,26 @@ class NativeAppWindowCocoa : public extensions::NativeAppWindow,
                        const extensions::AppWindow::CreateParams& params);
 
   // ui::BaseWindow implementation.
-  virtual bool IsActive() const OVERRIDE;
-  virtual bool IsMaximized() const OVERRIDE;
-  virtual bool IsMinimized() const OVERRIDE;
-  virtual bool IsFullscreen() const OVERRIDE;
-  virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
-  virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
-  virtual ui::WindowShowState GetRestoredState() const OVERRIDE;
-  virtual gfx::Rect GetBounds() const OVERRIDE;
-  virtual void Show() OVERRIDE;
-  virtual void ShowInactive() OVERRIDE;
-  virtual void Hide() OVERRIDE;
-  virtual void Close() OVERRIDE;
-  virtual void Activate() OVERRIDE;
-  virtual void Deactivate() OVERRIDE;
-  virtual void Maximize() OVERRIDE;
-  virtual void Minimize() OVERRIDE;
-  virtual void Restore() OVERRIDE;
-  virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
-  virtual void FlashFrame(bool flash) OVERRIDE;
-  virtual bool IsAlwaysOnTop() const OVERRIDE;
+  bool IsActive() const override;
+  bool IsMaximized() const override;
+  bool IsMinimized() const override;
+  bool IsFullscreen() const override;
+  gfx::NativeWindow GetNativeWindow() const override;
+  gfx::Rect GetRestoredBounds() const override;
+  ui::WindowShowState GetRestoredState() const override;
+  gfx::Rect GetBounds() const override;
+  void Show() override;
+  void ShowInactive() override;
+  void Hide() override;
+  void Close() override;
+  void Activate() override;
+  void Deactivate() override;
+  void Maximize() override;
+  void Minimize() override;
+  void Restore() override;
+  void SetBounds(const gfx::Rect& bounds) override;
+  void FlashFrame(bool flash) override;
+  bool IsAlwaysOnTop() const override;
 
   // Called when the window is about to be closed.
   void WindowWillClose();
@@ -120,52 +120,50 @@ class NativeAppWindowCocoa : public extensions::NativeAppWindow,
 
  protected:
   // NativeAppWindow implementation.
-  virtual void SetFullscreen(int fullscreen_types) OVERRIDE;
-  virtual bool IsFullscreenOrPending() const OVERRIDE;
-  virtual void UpdateWindowIcon() OVERRIDE;
-  virtual void UpdateWindowTitle() OVERRIDE;
-  virtual void UpdateBadgeIcon() OVERRIDE;
-  virtual void UpdateShape(scoped_ptr<SkRegion> region) OVERRIDE;
-  virtual void UpdateDraggableRegions(
-      const std::vector<extensions::DraggableRegion>& regions) OVERRIDE;
-  virtual SkRegion* GetDraggableRegion() OVERRIDE;
-  virtual void HandleKeyboardEvent(
-      const content::NativeWebKeyboardEvent& event) OVERRIDE;
-  virtual bool IsFrameless() const OVERRIDE;
-  virtual bool HasFrameColor() const OVERRIDE;
-  virtual SkColor ActiveFrameColor() const OVERRIDE;
-  virtual SkColor InactiveFrameColor() const OVERRIDE;
-  virtual gfx::Insets GetFrameInsets() const OVERRIDE;
-  virtual bool CanHaveAlphaEnabled() const OVERRIDE;
+  void SetFullscreen(int fullscreen_types) override;
+  bool IsFullscreenOrPending() const override;
+  void UpdateWindowIcon() override;
+  void UpdateWindowTitle() override;
+  void UpdateBadgeIcon() override;
+  void UpdateShape(scoped_ptr<SkRegion> region) override;
+  void UpdateDraggableRegions(
+      const std::vector<extensions::DraggableRegion>& regions) override;
+  SkRegion* GetDraggableRegion() override;
+  void HandleKeyboardEvent(
+      const content::NativeWebKeyboardEvent& event) override;
+  bool IsFrameless() const override;
+  bool HasFrameColor() const override;
+  SkColor ActiveFrameColor() const override;
+  SkColor InactiveFrameColor() const override;
+  gfx::Insets GetFrameInsets() const override;
+  bool CanHaveAlphaEnabled() const override;
 
   // These are used to simulate Mac-style hide/show. Since windows can be hidden
   // and shown using the app.window API, this sets is_hidden_with_app_ to
   // differentiate the reason a window was hidden.
-  virtual void ShowWithApp() OVERRIDE;
-  virtual void HideWithApp() OVERRIDE;
-  virtual void UpdateShelfMenu() OVERRIDE;
-  virtual gfx::Size GetContentMinimumSize() const OVERRIDE;
-  virtual gfx::Size GetContentMaximumSize() const OVERRIDE;
-  virtual void SetContentSizeConstraints(const gfx::Size& min_size,
-                                         const gfx::Size& max_size) OVERRIDE;
-  virtual void SetVisibleOnAllWorkspaces(bool always_visible) OVERRIDE;
+  void ShowWithApp() override;
+  void HideWithApp() override;
+  void UpdateShelfMenu() override;
+  gfx::Size GetContentMinimumSize() const override;
+  gfx::Size GetContentMaximumSize() const override;
+  void SetContentSizeConstraints(const gfx::Size& min_size,
+                                 const gfx::Size& max_size) override;
+  void SetVisibleOnAllWorkspaces(bool always_visible) override;
 
   // WebContentsObserver implementation.
-  virtual void RenderViewCreated(content::RenderViewHost* rvh) OVERRIDE;
+  void RenderViewCreated(content::RenderViewHost* rvh) override;
 
-  virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE;
+  void SetAlwaysOnTop(bool always_on_top) override;
 
   // WebContentsModalDialogHost implementation.
-  virtual gfx::NativeView GetHostView() const OVERRIDE;
-  virtual gfx::Point GetDialogPosition(const gfx::Size& size) OVERRIDE;
-  virtual gfx::Size GetMaximumDialogSize() OVERRIDE;
-  virtual void AddObserver(
-      web_modal::ModalDialogHostObserver* observer) OVERRIDE;
-  virtual void RemoveObserver(
-      web_modal::ModalDialogHostObserver* observer) OVERRIDE;
+  gfx::NativeView GetHostView() const override;
+  gfx::Point GetDialogPosition(const gfx::Size& size) override;
+  gfx::Size GetMaximumDialogSize() override;
+  void AddObserver(web_modal::ModalDialogHostObserver* observer) override;
+  void RemoveObserver(web_modal::ModalDialogHostObserver* observer) override;
 
  private:
-  virtual ~NativeAppWindowCocoa();
+  ~NativeAppWindowCocoa() override;
 
   ShellNSWindow* window() const;
   content::WebContents* WebContents() const;