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

OVERRIDE => override in native_window_views.h

Browse source
This commit is contained in:
Cheng Zhao 2014-11-12 20:08:51 +08:00
parent 79d4724a15
commit 42afc071eb
1 changed files with 66 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

132
atom/browser/native_window_views.h
View file

@ -32,47 +32,47 @@ class NativeWindowViews : public NativeWindow,
virtual ~NativeWindowViews(); virtual ~NativeWindowViews();
// NativeWindow: // NativeWindow:
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 SetMenu(ui::MenuModel* menu_model) OVERRIDE; void SetMenu(ui::MenuModel* menu_model) override;
virtual gfx::NativeWindow GetNativeWindow() OVERRIDE; gfx::NativeWindow GetNativeWindow() override;
virtual void SetProgressBar(double value) OVERRIDE; void SetProgressBar(double value) override;
gfx::AcceleratedWidget GetAcceleratedWidget(); gfx::AcceleratedWidget GetAcceleratedWidget();
@ -81,43 +81,43 @@ class NativeWindowViews : public NativeWindow,
private: private:
// NativeWindow: // NativeWindow:
virtual void UpdateDraggableRegions( void UpdateDraggableRegions(
const std::vector<DraggableRegion>& regions) OVERRIDE; const std::vector<DraggableRegion>& regions) override;
// views::WidgetObserver: // views::WidgetObserver:
virtual void OnWidgetActivationChanged( void OnWidgetActivationChanged(
views::Widget* widget, bool active) OVERRIDE; views::Widget* widget, bool active) override;
// views::WidgetDelegate: // views::WidgetDelegate:
virtual void DeleteDelegate() OVERRIDE; void DeleteDelegate() override;
virtual views::View* GetInitiallyFocusedView() OVERRIDE; views::View* GetInitiallyFocusedView() override;
virtual bool CanResize() const OVERRIDE; bool CanResize() const override;
virtual bool CanMaximize() const OVERRIDE; bool CanMaximize() const override;
virtual base::string16 GetWindowTitle() const OVERRIDE; base::string16 GetWindowTitle() const override;
virtual bool ShouldHandleSystemCommands() const OVERRIDE; bool ShouldHandleSystemCommands() const override;
virtual gfx::ImageSkia GetWindowAppIcon() OVERRIDE; gfx::ImageSkia GetWindowAppIcon() override;
virtual gfx::ImageSkia GetWindowIcon() OVERRIDE; gfx::ImageSkia GetWindowIcon() override;
virtual views::Widget* GetWidget() OVERRIDE; views::Widget* GetWidget() override;
virtual const views::Widget* GetWidget() const OVERRIDE; const views::Widget* GetWidget() const override;
virtual views::View* GetContentsView() OVERRIDE; views::View* GetContentsView() override;
virtual bool ShouldDescendIntoChildForEventHandling( bool ShouldDescendIntoChildForEventHandling(
gfx::NativeView child, gfx::NativeView child,
const gfx::Point& location) OVERRIDE; const gfx::Point& location) override;
virtual views::ClientView* CreateClientView(views::Widget* widget) OVERRIDE; views::ClientView* CreateClientView(views::Widget* widget) override;
virtual views::NonClientFrameView* CreateNonClientFrameView( views::NonClientFrameView* CreateNonClientFrameView(
views::Widget* widget) OVERRIDE; views::Widget* widget) override;
// brightray::InspectableWebContentsDelegate: // brightray::InspectableWebContentsDelegate:
virtual gfx::ImageSkia GetDevToolsWindowIcon() OVERRIDE; gfx::ImageSkia GetDevToolsWindowIcon() override;
// content::WebContentsDelegate: // content::WebContentsDelegate:
virtual void HandleMouseDown() OVERRIDE; void HandleMouseDown() override;
virtual void HandleKeyboardEvent( void HandleKeyboardEvent(
content::WebContents*, content::WebContents*,
const content::NativeWebKeyboardEvent& event) OVERRIDE; const content::NativeWebKeyboardEvent& event) override;
// views::View: // views::View:
virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
// Register accelerators supported by the menu model. // Register accelerators supported by the menu model.
void RegisterAccelerators(ui::MenuModel* menu_model); void RegisterAccelerators(ui::MenuModel* menu_model);