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

Side by Side Diff: chrome/browser/chromeos/login/webui_screen_locker.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 unified diff | Download patch | Annotate | Revision Log
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/login/webui_screen_locker.h" 5 #include "chrome/browser/chromeos/login/webui_screen_locker.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/wm/lock_state_controller.h" 8 #include "ash/wm/lock_state_controller.h"
9 #include "ash/wm/lock_state_observer.h" 9 #include "ash/wm/lock_state_observer.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 } 185 }
186 186
187 void WebUIScreenLocker::CreateAccount() { 187 void WebUIScreenLocker::CreateAccount() {
188 NOTREACHED(); 188 NOTREACHED();
189 } 189 }
190 190
191 void WebUIScreenLocker::CompleteLogin(const UserContext& user_context) { 191 void WebUIScreenLocker::CompleteLogin(const UserContext& user_context) {
192 NOTREACHED(); 192 NOTREACHED();
193 } 193 }
194 194
195 string16 WebUIScreenLocker::GetConnectedNetworkName() { 195 base::string16 WebUIScreenLocker::GetConnectedNetworkName() {
196 return network_state_helper_->GetCurrentNetworkName(); 196 return network_state_helper_->GetCurrentNetworkName();
197 } 197 }
198 198
199 bool WebUIScreenLocker::IsSigninInProgress() const { 199 bool WebUIScreenLocker::IsSigninInProgress() const {
200 // The way how screen locker is implemented right now there's no 200 // The way how screen locker is implemented right now there's no
201 // GAIA sign in in progress in any case. 201 // GAIA sign in in progress in any case.
202 return false; 202 return false;
203 } 203 }
204 204
205 void WebUIScreenLocker::Login(const UserContext& user_context) { 205 void WebUIScreenLocker::Login(const UserContext& user_context) {
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 318
319 void WebUIScreenLocker::RenderProcessGone(base::TerminationStatus status) { 319 void WebUIScreenLocker::RenderProcessGone(base::TerminationStatus status) {
320 if (browser_shutdown::GetShutdownType() == browser_shutdown::NOT_VALID && 320 if (browser_shutdown::GetShutdownType() == browser_shutdown::NOT_VALID &&
321 status != base::TERMINATION_STATUS_NORMAL_TERMINATION) { 321 status != base::TERMINATION_STATUS_NORMAL_TERMINATION) {
322 LOG(ERROR) << "Renderer crash on lock screen"; 322 LOG(ERROR) << "Renderer crash on lock screen";
323 Signout(); 323 Signout();
324 } 324 }
325 } 325 }
326 326
327 } // namespace chromeos 327 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/webui_screen_locker.h ('k') | chrome/browser/chromeos/memory/oom_priority_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698