| Index: chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
|
| diff --git a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
|
| index 09ac85a7c3967c8e20be6180e2c582a5ca22cf88..b8e751b2963c2b3aa22434e19ba03a902452bacd 100644
|
| --- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
|
| +++ b/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() 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(
|
| + 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;
|
| - virtual SkRegion* GetDraggableRegion() override;
|
| - virtual void HandleKeyboardEvent(
|
| + SkRegion* GetDraggableRegion() override;
|
| + 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;
|
| + 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;
|
|
|