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

Side by Side Diff: chrome/browser/chromeos/options/vpn_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 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/vpn_config_view.h" 5 #include "chrome/browser/chromeos/options/vpn_config_view.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 99
100 } // namespace 100 } // namespace
101 101
102 namespace chromeos { 102 namespace chromeos {
103 103
104 namespace internal { 104 namespace internal {
105 105
106 class ProviderTypeComboboxModel : public ui::ComboboxModel { 106 class ProviderTypeComboboxModel : public ui::ComboboxModel {
107 public: 107 public:
108 ProviderTypeComboboxModel(); 108 ProviderTypeComboboxModel();
109 virtual ~ProviderTypeComboboxModel(); 109 ~ProviderTypeComboboxModel() override;
110 110
111 // Overridden from ui::ComboboxModel: 111 // Overridden from ui::ComboboxModel:
112 virtual int GetItemCount() const override; 112 int GetItemCount() const override;
113 virtual base::string16 GetItemAt(int index) override; 113 base::string16 GetItemAt(int index) override;
114 114
115 private: 115 private:
116 DISALLOW_COPY_AND_ASSIGN(ProviderTypeComboboxModel); 116 DISALLOW_COPY_AND_ASSIGN(ProviderTypeComboboxModel);
117 }; 117 };
118 118
119 class VpnServerCACertComboboxModel : public ui::ComboboxModel { 119 class VpnServerCACertComboboxModel : public ui::ComboboxModel {
120 public: 120 public:
121 VpnServerCACertComboboxModel(); 121 VpnServerCACertComboboxModel();
122 virtual ~VpnServerCACertComboboxModel(); 122 ~VpnServerCACertComboboxModel() override;
123 123
124 // Overridden from ui::ComboboxModel: 124 // Overridden from ui::ComboboxModel:
125 virtual int GetItemCount() const override; 125 int GetItemCount() const override;
126 virtual base::string16 GetItemAt(int index) override; 126 base::string16 GetItemAt(int index) override;
127 127
128 private: 128 private:
129 DISALLOW_COPY_AND_ASSIGN(VpnServerCACertComboboxModel); 129 DISALLOW_COPY_AND_ASSIGN(VpnServerCACertComboboxModel);
130 }; 130 };
131 131
132 class VpnUserCertComboboxModel : public ui::ComboboxModel { 132 class VpnUserCertComboboxModel : public ui::ComboboxModel {
133 public: 133 public:
134 VpnUserCertComboboxModel(); 134 VpnUserCertComboboxModel();
135 virtual ~VpnUserCertComboboxModel(); 135 ~VpnUserCertComboboxModel() override;
136 136
137 // Overridden from ui::ComboboxModel: 137 // Overridden from ui::ComboboxModel:
138 virtual int GetItemCount() const override; 138 int GetItemCount() const override;
139 virtual base::string16 GetItemAt(int index) override; 139 base::string16 GetItemAt(int index) override;
140 140
141 private: 141 private:
142 DISALLOW_COPY_AND_ASSIGN(VpnUserCertComboboxModel); 142 DISALLOW_COPY_AND_ASSIGN(VpnUserCertComboboxModel);
143 }; 143 };
144 144
145 // ProviderTypeComboboxModel --------------------------------------------------- 145 // ProviderTypeComboboxModel ---------------------------------------------------
146 146
147 ProviderTypeComboboxModel::ProviderTypeComboboxModel() { 147 ProviderTypeComboboxModel::ProviderTypeComboboxModel() {
148 } 148 }
149 149
(...skipping 915 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 property_ui_data->ParseOncProperty( 1065 property_ui_data->ParseOncProperty(
1066 onc_source, 1066 onc_source,
1067 onc, 1067 onc,
1068 base::StringPrintf("%s.%s.%s", 1068 base::StringPrintf("%s.%s.%s",
1069 ::onc::network_config::kVPN, 1069 ::onc::network_config::kVPN,
1070 dict_key.c_str(), 1070 dict_key.c_str(),
1071 key.c_str())); 1071 key.c_str()));
1072 } 1072 }
1073 1073
1074 } // namespace chromeos 1074 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/vpn_config_view.h ('k') | chrome/browser/chromeos/options/wifi_config_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698