Skip to content

Commit

Permalink
fix forgotten API changes of chrome40
Browse files Browse the repository at this point in the history
OVERRIDE => override and delete "virtual"
  • Loading branch information
ralder committed Mar 17, 2015
1 parent 813bd92 commit dcf82fe
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions browser/views/window_views.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ class WidgetDelegateView : public views::WidgetDelegateView {
~WidgetDelegateView() {
}

virtual void DeleteDelegate() OVERRIDE { delete this; }
virtual views::View* GetContentsView() OVERRIDE { return this; }
virtual bool CanResize() const OVERRIDE { return true; }
virtual bool CanMaximize() const OVERRIDE { return true; }
virtual base::string16 GetWindowTitle() const OVERRIDE {
void DeleteDelegate() override { delete this; }
views::View* GetContentsView() override { return this; }
bool CanResize() const override { return true; }
bool CanMaximize() const override { return true; }
base::string16 GetWindowTitle() const override {
return base::ASCIIToUTF16("Brightray Example");
}
virtual gfx::Size GetPreferredSize() const OVERRIDE { return gfx::Size(800, 600); }
virtual gfx::Size GetMinimumSize() const OVERRIDE { return gfx::Size(100, 100); }
gfx::Size GetPreferredSize() const override { return gfx::Size(800, 600); }
gfx::Size GetMinimumSize() const override { return gfx::Size(100, 100); }

private:
scoped_ptr<WindowViews> window_;
Expand Down
2 changes: 1 addition & 1 deletion browser/views/window_views.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class WindowViews : public Window {
WindowViews(brightray::BrowserContext*);
~WindowViews();

virtual void Show() OVERRIDE;
void Show() override;

private:
views::Widget* widget_;
Expand Down

0 comments on commit dcf82fe

Please sign in to comment.