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

Unified Diff: chrome/browser/chromeos/login/screens/network_screen.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/login/screens/network_screen.h
diff --git a/chrome/browser/chromeos/login/screens/network_screen.h b/chrome/browser/chromeos/login/screens/network_screen.h
index 8937fc353ae0a97855f3534f257bdd01d14f7064..215d242d95e5439fd4f12e1c70ebc0d5cceea114 100644
--- a/chrome/browser/chromeos/login/screens/network_screen.h
+++ b/chrome/browser/chromeos/login/screens/network_screen.h
@@ -5,11 +5,12 @@
#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_NETWORK_SCREEN_H_
#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_NETWORK_SCREEN_H_
+#include <memory>
+
#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "base/strings/string16.h"
@@ -153,12 +154,14 @@ class NetworkScreen : public NetworkModel,
// Starts resolving language list on BlockingPool.
void ScheduleResolveLanguageList(
- scoped_ptr<locale_util::LanguageSwitchResult> language_switch_result);
+ std::unique_ptr<locale_util::LanguageSwitchResult>
+ language_switch_result);
// Callback for chromeos::ResolveUILanguageList() (from l10n_util).
- void OnLanguageListResolved(scoped_ptr<base::ListValue> new_language_list,
- const std::string& new_language_list_locale,
- const std::string& new_selected_language);
+ void OnLanguageListResolved(
+ std::unique_ptr<base::ListValue> new_language_list,
+ const std::string& new_language_list_locale,
+ const std::string& new_selected_language);
// Callback when the system timezone settings is changed.
void OnSystemTimezoneChanged();
@@ -176,11 +179,11 @@ class NetworkScreen : public NetworkModel,
// Timer for connection timeout.
base::OneShotTimer connection_timer_;
- scoped_ptr<CrosSettings::ObserverSubscription> timezone_subscription_;
+ std::unique_ptr<CrosSettings::ObserverSubscription> timezone_subscription_;
NetworkView* view_;
Delegate* delegate_;
- scoped_ptr<login::NetworkStateHelper> network_state_helper_;
+ std::unique_ptr<login::NetworkStateHelper> network_state_helper_;
std::string input_method_;
std::string timezone_;
@@ -188,7 +191,7 @@ class NetworkScreen : public NetworkModel,
// Creation of language list happens on Blocking Pool, so we cache
// resolved data.
std::string language_list_locale_;
- scoped_ptr<base::ListValue> language_list_;
+ std::unique_ptr<base::ListValue> language_list_;
// The exact language code selected by user in the menu.
std::string selected_language_code_;
« no previous file with comments | « chrome/browser/chromeos/login/screens/host_pairing_screen.h ('k') | chrome/browser/chromeos/login/screens/network_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698