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

Unified Diff: chrome/browser/chromeos/options/wifi_config_view.cc

Issue 854043002: Update {virtual,override,final} to follow C++11 style in chrome/browser/chromeos/options. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
Index: chrome/browser/chromeos/options/wifi_config_view.cc
diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc
index 7cd0ea6656d76519ddd43c8f88a5e18bde883e9b..70a76bc9c1e53287acb3b0ff464e05788b2ef0d1 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.cc
+++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -51,8 +51,8 @@ class ComboboxWithWidth : public views::Combobox {
: Combobox(model),
width_(width) {
}
- virtual ~ComboboxWithWidth() {}
- virtual gfx::Size GetPreferredSize() const override {
+ ~ComboboxWithWidth() override {}
+ gfx::Size GetPreferredSize() const override {
gfx::Size size = Combobox::GetPreferredSize();
size.set_width(width_);
return size;
@@ -102,11 +102,11 @@ namespace internal {
class SecurityComboboxModel : public ui::ComboboxModel {
public:
SecurityComboboxModel();
- virtual ~SecurityComboboxModel();
+ ~SecurityComboboxModel() override;
// Overridden from ui::ComboboxModel:
- virtual int GetItemCount() const override;
- virtual base::string16 GetItemAt(int index) override;
+ int GetItemCount() const override;
+ base::string16 GetItemAt(int index) override;
private:
DISALLOW_COPY_AND_ASSIGN(SecurityComboboxModel);
@@ -115,11 +115,11 @@ class SecurityComboboxModel : public ui::ComboboxModel {
class EAPMethodComboboxModel : public ui::ComboboxModel {
public:
EAPMethodComboboxModel();
- virtual ~EAPMethodComboboxModel();
+ ~EAPMethodComboboxModel() override;
// Overridden from ui::ComboboxModel:
- virtual int GetItemCount() const override;
- virtual base::string16 GetItemAt(int index) override;
+ int GetItemCount() const override;
+ base::string16 GetItemAt(int index) override;
private:
DISALLOW_COPY_AND_ASSIGN(EAPMethodComboboxModel);
@@ -128,11 +128,11 @@ class EAPMethodComboboxModel : public ui::ComboboxModel {
class Phase2AuthComboboxModel : public ui::ComboboxModel {
public:
explicit Phase2AuthComboboxModel(views::Combobox* eap_method_combobox);
- virtual ~Phase2AuthComboboxModel();
+ ~Phase2AuthComboboxModel() override;
// Overridden from ui::ComboboxModel:
- virtual int GetItemCount() const override;
- virtual base::string16 GetItemAt(int index) override;
+ int GetItemCount() const override;
+ base::string16 GetItemAt(int index) override;
private:
views::Combobox* eap_method_combobox_;
@@ -143,11 +143,11 @@ class Phase2AuthComboboxModel : public ui::ComboboxModel {
class ServerCACertComboboxModel : public ui::ComboboxModel {
public:
ServerCACertComboboxModel();
- virtual ~ServerCACertComboboxModel();
+ ~ServerCACertComboboxModel() override;
// Overridden from ui::ComboboxModel:
- virtual int GetItemCount() const override;
- virtual base::string16 GetItemAt(int index) override;
+ int GetItemCount() const override;
+ base::string16 GetItemAt(int index) override;
private:
DISALLOW_COPY_AND_ASSIGN(ServerCACertComboboxModel);
@@ -156,11 +156,11 @@ class ServerCACertComboboxModel : public ui::ComboboxModel {
class UserCertComboboxModel : public ui::ComboboxModel {
public:
explicit UserCertComboboxModel(WifiConfigView* owner);
- virtual ~UserCertComboboxModel();
+ ~UserCertComboboxModel() override;
// Overridden from ui::ComboboxModel:
- virtual int GetItemCount() const override;
- virtual base::string16 GetItemAt(int index) override;
+ int GetItemCount() const override;
+ base::string16 GetItemAt(int index) override;
private:
WifiConfigView* owner_;
« no previous file with comments | « chrome/browser/chromeos/options/wifi_config_view.h ('k') | chrome/browser/chromeos/options/wimax_config_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698