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

Unified Diff: chrome/browser/chromeos/login/screens/network_screen.cc

Issue 105193002: Replace string16 with base::string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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.cc
diff --git a/chrome/browser/chromeos/login/screens/network_screen.cc b/chrome/browser/chromeos/login/screens/network_screen.cc
index 94eb70e031773f2c39a53689a9e1cdec1c3eb9c2..af6d66e588267ea1907963a0a2a1ab538bffb090 100644
--- a/chrome/browser/chromeos/login/screens/network_screen.cc
+++ b/chrome/browser/chromeos/login/screens/network_screen.cc
@@ -162,7 +162,7 @@ void NetworkScreen::UpdateStatus() {
if (is_connected)
actor_->ClearErrors();
- string16 network_name = network_state_helper_->GetCurrentNetworkName();
+ base::string16 network_name = network_state_helper_->GetCurrentNetworkName();
if (is_connected) {
StopWaitingForConnection(network_name);
} else if (network_state_helper_->IsConnecting()) {
@@ -172,7 +172,7 @@ void NetworkScreen::UpdateStatus() {
}
}
-void NetworkScreen::StopWaitingForConnection(const string16& network_id) {
+void NetworkScreen::StopWaitingForConnection(const base::string16& network_id) {
bool is_connected = network_state_helper_->IsConnected();
if (is_connected && continue_pressed_) {
NotifyOnConnection();
@@ -189,7 +189,7 @@ void NetworkScreen::StopWaitingForConnection(const string16& network_id) {
}
}
-void NetworkScreen::WaitForConnection(const string16& network_id) {
+void NetworkScreen::WaitForConnection(const base::string16& network_id) {
if (network_id_ != network_id || !connection_timer_.IsRunning()) {
connection_timer_.Stop();
connection_timer_.Start(FROM_HERE,
« no previous file with comments | « chrome/browser/chromeos/login/screens/network_screen.h ('k') | chrome/browser/chromeos/login/screens/network_screen_actor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698