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

OVERRIDE => override in atom/browser/ui/views

Browse source
This commit is contained in:
Cheng Zhao 2014-11-16 15:54:40 +08:00
parent ab6cb042f6
commit b428b2eb99
6 changed files with 42 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
atom/browser/ui/views/frameless_view.h
View file

@ -27,21 +27,21 @@ class FramelessView : public views::NonClientFrameView {
protected: protected:
// views::NonClientFrameView: // views::NonClientFrameView:
virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; gfx::Rect GetBoundsForClientView() const override;
virtual gfx::Rect GetWindowBoundsForClientBounds( gfx::Rect GetWindowBoundsForClientBounds(
const gfx::Rect& client_bounds) const OVERRIDE; const gfx::Rect& client_bounds) const override;
virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; int NonClientHitTest(const gfx::Point& point) override;
virtual void GetWindowMask(const gfx::Size& size, void GetWindowMask(const gfx::Size& size,
gfx::Path* window_mask) OVERRIDE; gfx::Path* window_mask) override;
virtual void ResetWindowControls() OVERRIDE; void ResetWindowControls() override;
virtual void UpdateWindowIcon() OVERRIDE; void UpdateWindowIcon() override;
virtual void UpdateWindowTitle() OVERRIDE; void UpdateWindowTitle() override;
// Overridden from View: // Overridden from View:
virtual gfx::Size GetPreferredSize() const OVERRIDE; gfx::Size GetPreferredSize() const override;
virtual gfx::Size GetMinimumSize() const OVERRIDE; gfx::Size GetMinimumSize() const override;
virtual gfx::Size GetMaximumSize() const OVERRIDE; gfx::Size GetMaximumSize() const override;
virtual const char* GetClassName() const OVERRIDE; const char* GetClassName() const override;
// Not owned. // Not owned.
NativeWindowViews* window_; NativeWindowViews* window_;

9
atom/browser/ui/views/menu_bar.h
View file

@ -51,15 +51,14 @@ class MenuBar : public views::View,
protected: protected:
// views::View: // views::View:
virtual const char* GetClassName() const OVERRIDE; const char* GetClassName() const override;
// views::ButtonListener: // views::ButtonListener:
virtual void ButtonPressed(views::Button* sender, void ButtonPressed(views::Button* sender, const ui::Event& event) override;
const ui::Event& event) OVERRIDE;
// views::MenuButtonListener: // views::MenuButtonListener:
virtual void OnMenuButtonClicked(views::View* source, void OnMenuButtonClicked(views::View* source,
const gfx::Point& point) OVERRIDE; const gfx::Point& point) override;
private: private:
SkColor background_color_; SkColor background_color_;

29
atom/browser/ui/views/menu_delegate.h
View file

@ -30,25 +30,24 @@ class MenuDelegate : public views::MenuDelegate {
protected: protected:
// views::MenuDelegate: // views::MenuDelegate:
virtual void ExecuteCommand(int id) OVERRIDE; void ExecuteCommand(int id) override;
virtual void ExecuteCommand(int id, int mouse_event_flags) OVERRIDE; void ExecuteCommand(int id, int mouse_event_flags) override;
virtual bool IsTriggerableEvent(views::MenuItemView* source, bool IsTriggerableEvent(views::MenuItemView* source,
const ui::Event& e) OVERRIDE; const ui::Event& e) override;
virtual bool GetAccelerator(int id, bool GetAccelerator(int id, ui::Accelerator* accelerator) const override;
ui::Accelerator* accelerator) const OVERRIDE; base::string16 GetLabel(int id) const override;
virtual base::string16 GetLabel(int id) const OVERRIDE; const gfx::FontList* GetLabelFontList(int id) const override;
virtual const gfx::FontList* GetLabelFontList(int id) const OVERRIDE; bool IsCommandEnabled(int id) const override;
virtual bool IsCommandEnabled(int id) const OVERRIDE; bool IsItemChecked(int id) const override;
virtual bool IsItemChecked(int id) const OVERRIDE; void SelectionChanged(views::MenuItemView* menu) override;
virtual void SelectionChanged(views::MenuItemView* menu) OVERRIDE; void WillShowMenu(views::MenuItemView* menu) override;
virtual void WillShowMenu(views::MenuItemView* menu) OVERRIDE; void WillHideMenu(views::MenuItemView* menu) override;
virtual void WillHideMenu(views::MenuItemView* menu) OVERRIDE; views::MenuItemView* GetSiblingMenu(
virtual views::MenuItemView* GetSiblingMenu(
views::MenuItemView* menu, views::MenuItemView* menu,
const gfx::Point& screen_point, const gfx::Point& screen_point,
views::MenuAnchorPosition* anchor, views::MenuAnchorPosition* anchor,
bool* has_mnemonics, bool* has_mnemonics,
views::MenuButton** button); views::MenuButton** button) override;
private: private:
// Gets the cached menu item view from the model. // Gets the cached menu item view from the model.

8
atom/browser/ui/views/menu_layout.h
View file

@ -15,10 +15,10 @@ class MenuLayout : public views::FillLayout {
virtual ~MenuLayout(); virtual ~MenuLayout();
// views::LayoutManager: // views::LayoutManager:
virtual void Layout(views::View* host) OVERRIDE; void Layout(views::View* host) override;
virtual gfx::Size GetPreferredSize(const views::View* host) const OVERRIDE; gfx::Size GetPreferredSize(const views::View* host) const override;
virtual int GetPreferredHeightForWidth( int GetPreferredHeightForWidth(
const views::View* host, int width) const OVERRIDE; const views::View* host, int width) const override;
private: private:
bool HasMenu(const views::View* host) const; bool HasMenu(const views::View* host) const;

2
atom/browser/ui/views/submenu_button.h
View file

@ -26,7 +26,7 @@ class SubmenuButton : public views::MenuButton {
base::char16 accelerator() const { return accelerator_; } base::char16 accelerator() const { return accelerator_; }
// views::MenuButton: // views::MenuButton:
virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; void OnPaint(gfx::Canvas* canvas) override;
private: private:
bool GetUnderlinePosition(const base::string16& text, bool GetUnderlinePosition(const base::string16& text,

12
atom/browser/ui/views/win_frame_view.h
View file

@ -15,14 +15,14 @@ class WinFrameView : public FramelessView {
virtual ~WinFrameView(); virtual ~WinFrameView();
// views::NonClientFrameView: // views::NonClientFrameView:
virtual gfx::Rect GetWindowBoundsForClientBounds( gfx::Rect GetWindowBoundsForClientBounds(
const gfx::Rect& client_bounds) const OVERRIDE; const gfx::Rect& client_bounds) const override;
virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; int NonClientHitTest(const gfx::Point& point) override;
// views::View: // views::View:
virtual gfx::Size GetMinimumSize() const OVERRIDE; gfx::Size GetMinimumSize() const override;
virtual gfx::Size GetMaximumSize() const OVERRIDE; gfx::Size GetMaximumSize() const override;
virtual const char* GetClassName() const OVERRIDE; const char* GetClassName() const override;
private: private:
void ClientAreaSizeToWindowSize(gfx::Size* size) const; void ClientAreaSizeToWindowSize(gfx::Size* size) const;