mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

OVERRIDE => override in native_window_mac.h

Browse source
This commit is contained in:
Cheng Zhao 2014-12-23 15:31:39 -08:00
parent effcf18d56
commit 4ca0458b37
1 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
atom/browser/native_window_mac.h
View file

@ -26,52 +26,52 @@ class NativeWindowMac : public NativeWindow {
virtual ~NativeWindowMac(); virtual ~NativeWindowMac();
// NativeWindow implementation. // NativeWindow implementation.
virtual void Close() OVERRIDE; void Close() override;
virtual void CloseImmediately() OVERRIDE; void CloseImmediately() override;
virtual void Move(const gfx::Rect& pos) OVERRIDE; void Move(const gfx::Rect& pos) override;
virtual void Focus(bool focus) OVERRIDE; void Focus(bool focus) override;
virtual bool IsFocused() OVERRIDE; bool IsFocused() override;
virtual void Show() OVERRIDE; void Show() override;
virtual void ShowInactive() OVERRIDE; void ShowInactive() override;
virtual void Hide() OVERRIDE; void Hide() override;
virtual bool IsVisible() OVERRIDE; bool IsVisible() override;
virtual void Maximize() OVERRIDE; void Maximize() override;
virtual void Unmaximize() OVERRIDE; void Unmaximize() override;
virtual bool IsMaximized() OVERRIDE; bool IsMaximized() override;
virtual void Minimize() OVERRIDE; void Minimize() override;
virtual void Restore() OVERRIDE; void Restore() override;
virtual bool IsMinimized() OVERRIDE; bool IsMinimized() override;
virtual void SetFullScreen(bool fullscreen) OVERRIDE; void SetFullScreen(bool fullscreen) override;
virtual bool IsFullscreen() OVERRIDE; bool IsFullscreen() override;
virtual void SetSize(const gfx::Size& size) OVERRIDE; void SetSize(const gfx::Size& size) override;
virtual gfx::Size GetSize() OVERRIDE; gfx::Size GetSize() override;
virtual void SetContentSize(const gfx::Size& size) OVERRIDE; void SetContentSize(const gfx::Size& size) override;
virtual gfx::Size GetContentSize() OVERRIDE; gfx::Size GetContentSize() override;
virtual void SetMinimumSize(const gfx::Size& size) OVERRIDE; void SetMinimumSize(const gfx::Size& size) override;
virtual gfx::Size GetMinimumSize() OVERRIDE; gfx::Size GetMinimumSize() override;
virtual void SetMaximumSize(const gfx::Size& size) OVERRIDE; void SetMaximumSize(const gfx::Size& size) override;
virtual gfx::Size GetMaximumSize() OVERRIDE; gfx::Size GetMaximumSize() override;
virtual void SetResizable(bool resizable) OVERRIDE; void SetResizable(bool resizable) override;
virtual bool IsResizable() OVERRIDE; bool IsResizable() override;
virtual void SetAlwaysOnTop(bool top) OVERRIDE; void SetAlwaysOnTop(bool top) override;
virtual bool IsAlwaysOnTop() OVERRIDE; bool IsAlwaysOnTop() override;
virtual void Center() OVERRIDE; void Center() override;
virtual void SetPosition(const gfx::Point& position) OVERRIDE; void SetPosition(const gfx::Point& position) override;
virtual gfx::Point GetPosition() OVERRIDE; gfx::Point GetPosition() override;
virtual void SetTitle(const std::string& title) OVERRIDE; void SetTitle(const std::string& title) override;
virtual std::string GetTitle() OVERRIDE; std::string GetTitle() override;
virtual void FlashFrame(bool flash) OVERRIDE; void FlashFrame(bool flash) override;
virtual void SetSkipTaskbar(bool skip) OVERRIDE; void SetSkipTaskbar(bool skip) override;
virtual void SetKiosk(bool kiosk) OVERRIDE; void SetKiosk(bool kiosk) override;
virtual bool IsKiosk() OVERRIDE; bool IsKiosk() override;
virtual void SetRepresentedFilename(const std::string& filename) OVERRIDE; void SetRepresentedFilename(const std::string& filename) override;
virtual std::string GetRepresentedFilename() OVERRIDE; std::string GetRepresentedFilename() override;
virtual void SetDocumentEdited(bool edited) OVERRIDE; void SetDocumentEdited(bool edited) override;
virtual bool IsDocumentEdited() OVERRIDE; bool IsDocumentEdited() override;
virtual bool HasModalDialog() OVERRIDE; bool HasModalDialog() override;
virtual gfx::NativeWindow GetNativeWindow() OVERRIDE; gfx::NativeWindow GetNativeWindow() override;
virtual void SetProgressBar(double progress) OVERRIDE; void SetProgressBar(double progress) override;
virtual void ShowDefinitionForSelection() OVERRIDE; void ShowDefinitionForSelection() override;
// Returns true if |point| in local Cocoa coordinate system falls within // Returns true if |point| in local Cocoa coordinate system falls within
// the draggable region. // the draggable region.
@ -86,13 +86,13 @@ class NativeWindowMac : public NativeWindow {
SkRegion* draggable_region() const { return draggable_region_.get(); } SkRegion* draggable_region() const { return draggable_region_.get(); }
protected: protected:
virtual void UpdateDraggableRegions( void UpdateDraggableRegions(
const std::vector<DraggableRegion>& regions) OVERRIDE; const std::vector<DraggableRegion>& regions) override;
// Implementations of content::WebContentsDelegate. // Implementations of content::WebContentsDelegate.
virtual void HandleKeyboardEvent( void HandleKeyboardEvent(
content::WebContents*, content::WebContents*,
const content::NativeWebKeyboardEvent&) OVERRIDE; const content::NativeWebKeyboardEvent&) override;
private: private:
void InstallView(); void InstallView();