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

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

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 #include "chrome/browser/chromeos/options/wifi_config_view.h" 5 #include "chrome/browser/chromeos/options/wifi_config_view.h"
6 6
7 #include "ash/system/chromeos/network/network_connect.h" 7 #include "ash/system/chromeos/network/network_connect.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 // Combobox that supports a preferred width. Used by Server CA combobox 46 // Combobox that supports a preferred width. Used by Server CA combobox
47 // because the strings inside it are too wide. 47 // because the strings inside it are too wide.
48 class ComboboxWithWidth : public views::Combobox { 48 class ComboboxWithWidth : public views::Combobox {
49 public: 49 public:
50 ComboboxWithWidth(ui::ComboboxModel* model, int width) 50 ComboboxWithWidth(ui::ComboboxModel* model, int width)
51 : Combobox(model), 51 : Combobox(model),
52 width_(width) { 52 width_(width) {
53 } 53 }
54 virtual ~ComboboxWithWidth() {} 54 virtual ~ComboboxWithWidth() {}
55 virtual gfx::Size GetPreferredSize() const OVERRIDE { 55 virtual gfx::Size GetPreferredSize() const override {
56 gfx::Size size = Combobox::GetPreferredSize(); 56 gfx::Size size = Combobox::GetPreferredSize();
57 size.set_width(width_); 57 size.set_width(width_);
58 return size; 58 return size;
59 } 59 }
60 private: 60 private:
61 int width_; 61 int width_;
62 DISALLOW_COPY_AND_ASSIGN(ComboboxWithWidth); 62 DISALLOW_COPY_AND_ASSIGN(ComboboxWithWidth);
63 }; 63 };
64 64
65 enum SecurityComboboxIndex { 65 enum SecurityComboboxIndex {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 } // namespace 98 } // namespace
99 99
100 namespace internal { 100 namespace internal {
101 101
102 class SecurityComboboxModel : public ui::ComboboxModel { 102 class SecurityComboboxModel : public ui::ComboboxModel {
103 public: 103 public:
104 SecurityComboboxModel(); 104 SecurityComboboxModel();
105 virtual ~SecurityComboboxModel(); 105 virtual ~SecurityComboboxModel();
106 106
107 // Overridden from ui::ComboboxModel: 107 // Overridden from ui::ComboboxModel:
108 virtual int GetItemCount() const OVERRIDE; 108 virtual int GetItemCount() const override;
109 virtual base::string16 GetItemAt(int index) OVERRIDE; 109 virtual base::string16 GetItemAt(int index) override;
110 110
111 private: 111 private:
112 DISALLOW_COPY_AND_ASSIGN(SecurityComboboxModel); 112 DISALLOW_COPY_AND_ASSIGN(SecurityComboboxModel);
113 }; 113 };
114 114
115 class EAPMethodComboboxModel : public ui::ComboboxModel { 115 class EAPMethodComboboxModel : public ui::ComboboxModel {
116 public: 116 public:
117 EAPMethodComboboxModel(); 117 EAPMethodComboboxModel();
118 virtual ~EAPMethodComboboxModel(); 118 virtual ~EAPMethodComboboxModel();
119 119
120 // Overridden from ui::ComboboxModel: 120 // Overridden from ui::ComboboxModel:
121 virtual int GetItemCount() const OVERRIDE; 121 virtual int GetItemCount() const override;
122 virtual base::string16 GetItemAt(int index) OVERRIDE; 122 virtual base::string16 GetItemAt(int index) override;
123 123
124 private: 124 private:
125 DISALLOW_COPY_AND_ASSIGN(EAPMethodComboboxModel); 125 DISALLOW_COPY_AND_ASSIGN(EAPMethodComboboxModel);
126 }; 126 };
127 127
128 class Phase2AuthComboboxModel : public ui::ComboboxModel { 128 class Phase2AuthComboboxModel : public ui::ComboboxModel {
129 public: 129 public:
130 explicit Phase2AuthComboboxModel(views::Combobox* eap_method_combobox); 130 explicit Phase2AuthComboboxModel(views::Combobox* eap_method_combobox);
131 virtual ~Phase2AuthComboboxModel(); 131 virtual ~Phase2AuthComboboxModel();
132 132
133 // Overridden from ui::ComboboxModel: 133 // Overridden from ui::ComboboxModel:
134 virtual int GetItemCount() const OVERRIDE; 134 virtual int GetItemCount() const override;
135 virtual base::string16 GetItemAt(int index) OVERRIDE; 135 virtual base::string16 GetItemAt(int index) override;
136 136
137 private: 137 private:
138 views::Combobox* eap_method_combobox_; 138 views::Combobox* eap_method_combobox_;
139 139
140 DISALLOW_COPY_AND_ASSIGN(Phase2AuthComboboxModel); 140 DISALLOW_COPY_AND_ASSIGN(Phase2AuthComboboxModel);
141 }; 141 };
142 142
143 class ServerCACertComboboxModel : public ui::ComboboxModel { 143 class ServerCACertComboboxModel : public ui::ComboboxModel {
144 public: 144 public:
145 ServerCACertComboboxModel(); 145 ServerCACertComboboxModel();
146 virtual ~ServerCACertComboboxModel(); 146 virtual ~ServerCACertComboboxModel();
147 147
148 // Overridden from ui::ComboboxModel: 148 // Overridden from ui::ComboboxModel:
149 virtual int GetItemCount() const OVERRIDE; 149 virtual int GetItemCount() const override;
150 virtual base::string16 GetItemAt(int index) OVERRIDE; 150 virtual base::string16 GetItemAt(int index) override;
151 151
152 private: 152 private:
153 DISALLOW_COPY_AND_ASSIGN(ServerCACertComboboxModel); 153 DISALLOW_COPY_AND_ASSIGN(ServerCACertComboboxModel);
154 }; 154 };
155 155
156 class UserCertComboboxModel : public ui::ComboboxModel { 156 class UserCertComboboxModel : public ui::ComboboxModel {
157 public: 157 public:
158 explicit UserCertComboboxModel(WifiConfigView* owner); 158 explicit UserCertComboboxModel(WifiConfigView* owner);
159 virtual ~UserCertComboboxModel(); 159 virtual ~UserCertComboboxModel();
160 160
161 // Overridden from ui::ComboboxModel: 161 // Overridden from ui::ComboboxModel:
162 virtual int GetItemCount() const OVERRIDE; 162 virtual int GetItemCount() const override;
163 virtual base::string16 GetItemAt(int index) OVERRIDE; 163 virtual base::string16 GetItemAt(int index) override;
164 164
165 private: 165 private:
166 WifiConfigView* owner_; 166 WifiConfigView* owner_;
167 167
168 DISALLOW_COPY_AND_ASSIGN(UserCertComboboxModel); 168 DISALLOW_COPY_AND_ASSIGN(UserCertComboboxModel);
169 }; 169 };
170 170
171 // SecurityComboboxModel ------------------------------------------------------- 171 // SecurityComboboxModel -------------------------------------------------------
172 172
173 SecurityComboboxModel::SecurityComboboxModel() { 173 SecurityComboboxModel::SecurityComboboxModel() {
(...skipping 1202 matching lines...) Expand 10 before | Expand all | Expand 10 after
1376 void WifiConfigView::ParseEAPUIProperty(NetworkPropertyUIData* property_ui_data, 1376 void WifiConfigView::ParseEAPUIProperty(NetworkPropertyUIData* property_ui_data,
1377 const NetworkState* network, 1377 const NetworkState* network,
1378 const std::string& key) { 1378 const std::string& key) {
1379 std::string onc_tag = network->type() == shill::kTypeEthernet 1379 std::string onc_tag = network->type() == shill::kTypeEthernet
1380 ? ::onc::ethernet::kEAP 1380 ? ::onc::ethernet::kEAP
1381 : ::onc::wifi::kEAP; 1381 : ::onc::wifi::kEAP;
1382 ParseUIProperty(property_ui_data, network, onc_tag + '.' + key); 1382 ParseUIProperty(property_ui_data, network, onc_tag + '.' + key);
1383 } 1383 }
1384 1384
1385 } // namespace chromeos 1385 } // namespace chromeos
OLDNEW
« 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