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

Unified Diff: chrome/browser/chromeos/options/wifi_config_view.h

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/options/wifi_config_view.h
diff --git a/chrome/browser/chromeos/options/wifi_config_view.h b/chrome/browser/chromeos/options/wifi_config_view.h
index 6a68f7e77a2bc0f68c391e48a84621fb2fe9d4db..ede9a59de0c08f2ba21bf38cae933223f986d359 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.h
+++ b/chrome/browser/chromeos/options/wifi_config_view.h
@@ -5,11 +5,11 @@
#ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_WIFI_CONFIG_VIEW_H_
#define CHROME_BROWSER_CHROMEOS_OPTIONS_WIFI_CONFIG_VIEW_H_
+#include <memory>
#include <string>
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/string16.h"
#include "chrome/browser/chromeos/options/cert_library.h"
@@ -183,16 +183,17 @@ class WifiConfigView : public ChildNetworkConfigView,
NetworkPropertyUIData passphrase_ui_data_;
views::Textfield* ssid_textfield_;
- scoped_ptr<internal::EAPMethodComboboxModel> eap_method_combobox_model_;
+ std::unique_ptr<internal::EAPMethodComboboxModel> eap_method_combobox_model_;
views::Combobox* eap_method_combobox_;
views::Label* phase_2_auth_label_;
- scoped_ptr<internal::Phase2AuthComboboxModel> phase_2_auth_combobox_model_;
+ std::unique_ptr<internal::Phase2AuthComboboxModel>
+ phase_2_auth_combobox_model_;
views::Combobox* phase_2_auth_combobox_;
views::Label* user_cert_label_;
- scoped_ptr<internal::UserCertComboboxModel> user_cert_combobox_model_;
+ std::unique_ptr<internal::UserCertComboboxModel> user_cert_combobox_model_;
views::Combobox* user_cert_combobox_;
views::Label* server_ca_cert_label_;
- scoped_ptr<internal::ServerCACertComboboxModel>
+ std::unique_ptr<internal::ServerCACertComboboxModel>
server_ca_cert_combobox_model_;
views::Combobox* server_ca_cert_combobox_;
views::Label* subject_match_label_;
@@ -204,7 +205,7 @@ class WifiConfigView : public ChildNetworkConfigView,
views::Checkbox* save_credentials_checkbox_;
views::Checkbox* share_network_checkbox_;
views::Label* shared_network_label_;
- scoped_ptr<internal::SecurityComboboxModel> security_combobox_model_;
+ std::unique_ptr<internal::SecurityComboboxModel> security_combobox_model_;
views::Combobox* security_combobox_;
views::Label* passphrase_label_;
PassphraseTextfield* passphrase_textfield_;
« 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