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

Side by Side Diff: chrome/browser/chromeos/options/wifi_config_view.h

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_WIFI_CONFIG_VIEW_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_WIFI_CONFIG_VIEW_H_
6 #define CHROME_BROWSER_CHROMEOS_OPTIONS_WIFI_CONFIG_VIEW_H_ 6 #define CHROME_BROWSER_CHROMEOS_OPTIONS_WIFI_CONFIG_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 // If |service_path| is not empty it identifies the network to be configured. 54 // If |service_path| is not empty it identifies the network to be configured.
55 // Otherwise |show_8021x| determines whether or not to show the 'advanced' 55 // Otherwise |show_8021x| determines whether or not to show the 'advanced'
56 // 8021x configuration UI for a hidden WiFi network. 56 // 8021x configuration UI for a hidden WiFi network.
57 WifiConfigView(NetworkConfigView* parent, 57 WifiConfigView(NetworkConfigView* parent,
58 const std::string& service_path, 58 const std::string& service_path,
59 bool show_8021x); 59 bool show_8021x);
60 virtual ~WifiConfigView(); 60 virtual ~WifiConfigView();
61 61
62 // views::TextfieldController 62 // views::TextfieldController
63 virtual void ContentsChanged(views::Textfield* sender, 63 virtual void ContentsChanged(views::Textfield* sender,
64 const base::string16& new_contents) OVERRIDE; 64 const base::string16& new_contents) override;
65 virtual bool HandleKeyEvent(views::Textfield* sender, 65 virtual bool HandleKeyEvent(views::Textfield* sender,
66 const ui::KeyEvent& key_event) OVERRIDE; 66 const ui::KeyEvent& key_event) override;
67 67
68 // views::ButtonListener 68 // views::ButtonListener
69 virtual void ButtonPressed(views::Button* sender, 69 virtual void ButtonPressed(views::Button* sender,
70 const ui::Event& event) OVERRIDE; 70 const ui::Event& event) override;
71 71
72 // views::ComboboxListener 72 // views::ComboboxListener
73 virtual void OnPerformAction(views::Combobox* combobox) OVERRIDE; 73 virtual void OnPerformAction(views::Combobox* combobox) override;
74 74
75 // CertLibrary::Observer 75 // CertLibrary::Observer
76 virtual void OnCertificatesLoaded(bool initial_load) OVERRIDE; 76 virtual void OnCertificatesLoaded(bool initial_load) override;
77 77
78 // ChildNetworkConfigView 78 // ChildNetworkConfigView
79 virtual base::string16 GetTitle() const OVERRIDE; 79 virtual base::string16 GetTitle() const override;
80 virtual views::View* GetInitiallyFocusedView() OVERRIDE; 80 virtual views::View* GetInitiallyFocusedView() override;
81 virtual bool CanLogin() OVERRIDE; 81 virtual bool CanLogin() override;
82 virtual bool Login() OVERRIDE; 82 virtual bool Login() override;
83 virtual void Cancel() OVERRIDE; 83 virtual void Cancel() override;
84 virtual void InitFocus() OVERRIDE; 84 virtual void InitFocus() override;
85 virtual bool IsConfigureDialog() OVERRIDE; 85 virtual bool IsConfigureDialog() override;
86 86
87 // NetworkStateHandlerObserver 87 // NetworkStateHandlerObserver
88 virtual void NetworkPropertiesUpdated(const NetworkState* network) OVERRIDE; 88 virtual void NetworkPropertiesUpdated(const NetworkState* network) override;
89 89
90 // Parses a UI |property| from the ONC associated with |network|. |key| 90 // Parses a UI |property| from the ONC associated with |network|. |key|
91 // is the property name within the ONC dictionary. 91 // is the property name within the ONC dictionary.
92 static void ParseUIProperty(NetworkPropertyUIData* property_ui_data, 92 static void ParseUIProperty(NetworkPropertyUIData* property_ui_data,
93 const NetworkState* network, 93 const NetworkState* network,
94 const std::string& key); 94 const std::string& key);
95 95
96 // Parses an EAP UI |property| from the ONC associated with |network|. 96 // Parses an EAP UI |property| from the ONC associated with |network|.
97 // |key| is the property name within the ONC EAP dictionary. 97 // |key| is the property name within the ONC EAP dictionary.
98 static void ParseEAPUIProperty(NetworkPropertyUIData* property_ui_data, 98 static void ParseEAPUIProperty(NetworkPropertyUIData* property_ui_data,
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 views::Label* error_label_; 211 views::Label* error_label_;
212 212
213 base::WeakPtrFactory<WifiConfigView> weak_ptr_factory_; 213 base::WeakPtrFactory<WifiConfigView> weak_ptr_factory_;
214 214
215 DISALLOW_COPY_AND_ASSIGN(WifiConfigView); 215 DISALLOW_COPY_AND_ASSIGN(WifiConfigView);
216 }; 216 };
217 217
218 } // namespace chromeos 218 } // namespace chromeos
219 219
220 #endif // CHROME_BROWSER_CHROMEOS_OPTIONS_WIFI_CONFIG_VIEW_H_ 220 #endif // CHROME_BROWSER_CHROMEOS_OPTIONS_WIFI_CONFIG_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/vpn_config_view.cc ('k') | chrome/browser/chromeos/options/wifi_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698