Index: chrome/browser/chromeos/options/network_config_view.h |
diff --git a/chrome/browser/chromeos/options/network_config_view.h b/chrome/browser/chromeos/options/network_config_view.h |
index 58b45bfbe8e49ca27caddac9fb444832d0713a50..2de514e5ea0006fa34176ba3c5810939859df160 100644 |
--- a/chrome/browser/chromeos/options/network_config_view.h |
+++ b/chrome/browser/chromeos/options/network_config_view.h |
@@ -54,24 +54,22 @@ class NetworkConfigView : public views::DialogDelegateView, |
gfx::NativeWindow GetNativeWindow() const; |
// views::DialogDelegate methods. |
- virtual base::string16 GetDialogButtonLabel( |
- ui::DialogButton button) const override; |
- virtual bool IsDialogButtonEnabled(ui::DialogButton button) const override; |
- virtual bool Cancel() override; |
- virtual bool Accept() override; |
- virtual views::View* CreateExtraView() override; |
- virtual views::View* GetInitiallyFocusedView() override; |
+ base::string16 GetDialogButtonLabel(ui::DialogButton button) const override; |
+ bool IsDialogButtonEnabled(ui::DialogButton button) const override; |
+ bool Cancel() override; |
+ bool Accept() override; |
+ views::View* CreateExtraView() override; |
+ views::View* GetInitiallyFocusedView() override; |
// views::WidgetDelegate methods. |
- virtual base::string16 GetWindowTitle() const override; |
- virtual ui::ModalType GetModalType() const override; |
+ base::string16 GetWindowTitle() const override; |
+ ui::ModalType GetModalType() const override; |
// views::View overrides. |
- virtual void GetAccessibleState(ui::AXViewState* state) override; |
+ void GetAccessibleState(ui::AXViewState* state) override; |
// views::ButtonListener overrides. |
- virtual void ButtonPressed( |
- views::Button* sender, const ui::Event& event) override; |
+ void ButtonPressed(views::Button* sender, const ui::Event& event) override; |
void set_delegate(Delegate* delegate) { |
delegate_ = delegate; |
@@ -79,14 +77,14 @@ class NetworkConfigView : public views::DialogDelegateView, |
protected: |
// views::View overrides: |
- virtual void Layout() override; |
- virtual gfx::Size GetPreferredSize() const override; |
- virtual void ViewHierarchyChanged( |
+ void Layout() override; |
+ gfx::Size GetPreferredSize() const override; |
+ void ViewHierarchyChanged( |
const ViewHierarchyChangedDetails& details) override; |
private: |
NetworkConfigView(); |
- virtual ~NetworkConfigView(); |
+ ~NetworkConfigView() override; |
// Login dialog for known networks. Returns true if successfully created. |
bool InitWithNetworkState(const NetworkState* network); |
@@ -119,7 +117,7 @@ class ChildNetworkConfigView : public views::View { |
// be created. |
ChildNetworkConfigView(NetworkConfigView* parent, |
const std::string& service_path); |
- virtual ~ChildNetworkConfigView(); |
+ ~ChildNetworkConfigView() override; |
// Get the title to show for the dialog. |
virtual base::string16 GetTitle() const = 0; |
@@ -164,15 +162,15 @@ class ControlledSettingIndicatorView : public views::View { |
public: |
ControlledSettingIndicatorView(); |
explicit ControlledSettingIndicatorView(const NetworkPropertyUIData& ui_data); |
- virtual ~ControlledSettingIndicatorView(); |
+ ~ControlledSettingIndicatorView() override; |
// Updates the view based on |ui_data|. |
void Update(const NetworkPropertyUIData& ui_data); |
protected: |
// views::View: |
- virtual gfx::Size GetPreferredSize() const override; |
- virtual void Layout() override; |
+ gfx::Size GetPreferredSize() const override; |
+ void Layout() override; |
private: |
// Initializes the view. |