| 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 8f0680fa7fa289535d08987251963bc7e50bd825..2263c2d8ce7113d9c7b39e8ddf4899d14396c885 100644
|
| --- a/chrome/browser/chromeos/options/wifi_config_view.cc
|
| +++ b/chrome/browser/chromeos/options/wifi_config_view.cc
|
| @@ -52,7 +52,7 @@ class ComboboxWithWidth : public views::Combobox {
|
| width_(width) {
|
| }
|
| virtual ~ComboboxWithWidth() {}
|
| - virtual gfx::Size GetPreferredSize() const OVERRIDE {
|
| + virtual gfx::Size GetPreferredSize() const override {
|
| gfx::Size size = Combobox::GetPreferredSize();
|
| size.set_width(width_);
|
| return size;
|
| @@ -105,8 +105,8 @@ class SecurityComboboxModel : public ui::ComboboxModel {
|
| virtual ~SecurityComboboxModel();
|
|
|
| // Overridden from ui::ComboboxModel:
|
| - virtual int GetItemCount() const OVERRIDE;
|
| - virtual base::string16 GetItemAt(int index) OVERRIDE;
|
| + virtual int GetItemCount() const override;
|
| + virtual base::string16 GetItemAt(int index) override;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(SecurityComboboxModel);
|
| @@ -118,8 +118,8 @@ class EAPMethodComboboxModel : public ui::ComboboxModel {
|
| virtual ~EAPMethodComboboxModel();
|
|
|
| // Overridden from ui::ComboboxModel:
|
| - virtual int GetItemCount() const OVERRIDE;
|
| - virtual base::string16 GetItemAt(int index) OVERRIDE;
|
| + virtual int GetItemCount() const override;
|
| + virtual base::string16 GetItemAt(int index) override;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(EAPMethodComboboxModel);
|
| @@ -131,8 +131,8 @@ class Phase2AuthComboboxModel : public ui::ComboboxModel {
|
| virtual ~Phase2AuthComboboxModel();
|
|
|
| // Overridden from ui::ComboboxModel:
|
| - virtual int GetItemCount() const OVERRIDE;
|
| - virtual base::string16 GetItemAt(int index) OVERRIDE;
|
| + virtual int GetItemCount() const override;
|
| + virtual base::string16 GetItemAt(int index) override;
|
|
|
| private:
|
| views::Combobox* eap_method_combobox_;
|
| @@ -146,8 +146,8 @@ class ServerCACertComboboxModel : public ui::ComboboxModel {
|
| virtual ~ServerCACertComboboxModel();
|
|
|
| // Overridden from ui::ComboboxModel:
|
| - virtual int GetItemCount() const OVERRIDE;
|
| - virtual base::string16 GetItemAt(int index) OVERRIDE;
|
| + virtual int GetItemCount() const override;
|
| + virtual base::string16 GetItemAt(int index) override;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(ServerCACertComboboxModel);
|
| @@ -159,8 +159,8 @@ class UserCertComboboxModel : public ui::ComboboxModel {
|
| virtual ~UserCertComboboxModel();
|
|
|
| // Overridden from ui::ComboboxModel:
|
| - virtual int GetItemCount() const OVERRIDE;
|
| - virtual base::string16 GetItemAt(int index) OVERRIDE;
|
| + virtual int GetItemCount() const override;
|
| + virtual base::string16 GetItemAt(int index) override;
|
|
|
| private:
|
| WifiConfigView* owner_;
|
|
|