Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2906)

Unified Diff: content/shell/browser/shell_views.cc

Issue 686523002: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/browser/shell_platform_data_aura.cc ('k') | content/test/image_decoder_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell_views.cc
diff --git a/content/shell/browser/shell_views.cc b/content/shell/browser/shell_views.cc
index 6b0161c467e01593945a7ff0f6e650a86615e3ed..734e637ed05c95ba55c6a7db959541021521e883 100644
--- a/content/shell/browser/shell_views.cc
+++ b/content/shell/browser/shell_views.cc
@@ -57,8 +57,7 @@ class ShellViewsDelegateAura : public views::DesktopTestViewsDelegate {
ShellViewsDelegateAura() : use_transparent_windows_(false) {
}
- virtual ~ShellViewsDelegateAura() {
- }
+ ~ShellViewsDelegateAura() override {}
void SetUseTransparentWindows(bool transparent) {
use_transparent_windows_ = transparent;
@@ -83,16 +82,13 @@ class ContextMenuModel : public ui::SimpleMenuModel,
}
// ui::SimpleMenuModel::Delegate:
- virtual bool IsCommandIdChecked(int command_id) const override {
+ bool IsCommandIdChecked(int command_id) const override { return false; }
+ bool IsCommandIdEnabled(int command_id) const override { return true; }
+ bool GetAcceleratorForCommandId(int command_id,
+ ui::Accelerator* accelerator) override {
return false;
}
- virtual bool IsCommandIdEnabled(int command_id) const override {
- return true;
- }
- virtual bool GetAcceleratorForCommandId(
- int command_id,
- ui::Accelerator* accelerator) override { return false; }
- virtual void ExecuteCommand(int command_id, int event_flags) override {
+ void ExecuteCommand(int command_id, int event_flags) override {
switch (command_id) {
case COMMAND_OPEN_DEVTOOLS:
shell_->ShowDevToolsForElementAt(params_.x, params_.y);
@@ -127,7 +123,7 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
toolbar_view_(new View),
contents_view_(new View) {
}
- virtual ~ShellWindowDelegateView() {}
+ ~ShellWindowDelegateView() override {}
// Update the state of UI controls
void SetAddressBarURL(const GURL& url) {
@@ -308,11 +304,10 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
}
}
// Overridden from TextfieldController
- virtual void ContentsChanged(views::Textfield* sender,
- const base::string16& new_contents) override {
- }
- virtual bool HandleKeyEvent(views::Textfield* sender,
- const ui::KeyEvent& key_event) override {
+ void ContentsChanged(views::Textfield* sender,
+ const base::string16& new_contents) override {}
+ bool HandleKeyEvent(views::Textfield* sender,
+ const ui::KeyEvent& key_event) override {
if (sender == url_entry_ && key_event.key_code() == ui::VKEY_RETURN) {
std::string text = base::UTF16ToUTF8(url_entry_->text());
GURL url(text);
@@ -327,8 +322,7 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
}
// Overridden from ButtonListener
- virtual void ButtonPressed(views::Button* sender,
- const ui::Event& event) override {
+ void ButtonPressed(views::Button* sender, const ui::Event& event) override {
if (sender == back_button_)
shell_->GoBackOrForward(-1);
else if (sender == forward_button_)
@@ -340,27 +334,25 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
}
// Overridden from WidgetDelegateView
- virtual bool CanResize() const override { return true; }
- virtual bool CanMaximize() const override { return true; }
- virtual bool CanMinimize() const override { return true; }
- virtual base::string16 GetWindowTitle() const override {
- return title_;
- }
- virtual void WindowClosing() override {
+ bool CanResize() const override { return true; }
+ bool CanMaximize() const override { return true; }
+ bool CanMinimize() const override { return true; }
+ base::string16 GetWindowTitle() const override { return title_; }
+ void WindowClosing() override {
if (shell_) {
delete shell_;
shell_ = NULL;
}
}
- virtual View* GetContentsView() override { return this; }
+ View* GetContentsView() override { return this; }
// Overridden from View
- virtual gfx::Size GetMinimumSize() const override {
+ gfx::Size GetMinimumSize() const override {
// We want to be able to make the window smaller than its initial
// (preferred) size.
return gfx::Size();
}
- virtual void ViewHierarchyChanged(
+ void ViewHierarchyChanged(
const ViewHierarchyChangedDetails& details) override {
if (details.is_add && details.child == this) {
InitShellWindow();
@@ -368,7 +360,7 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
}
// Overridden from AcceleratorTarget:
- virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override {
+ bool AcceleratorPressed(const ui::Accelerator& accelerator) override {
switch (accelerator.key_code()) {
case ui::VKEY_F5:
shell_->Reload();
« no previous file with comments | « content/shell/browser/shell_platform_data_aura.cc ('k') | content/test/image_decoder_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698