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

Side by Side Diff: chrome/browser/chromeos/login/user_manager.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/user_manager.h" 5 #include "chrome/browser/chromeos/login/user_manager.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/field_trial.h" 8 #include "base/metrics/field_trial.h"
9 #include "chrome/browser/chromeos/login/user_manager_impl.h" 9 #include "chrome/browser/chromeos/login/user_manager_impl.h"
10 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 const std::string& hash) { 45 const std::string& hash) {
46 } 46 }
47 47
48 void UserManager::UserSessionStateObserver:: 48 void UserManager::UserSessionStateObserver::
49 PendingUserSessionsRestoreFinished() { 49 PendingUserSessionsRestoreFinished() {
50 } 50 }
51 51
52 UserManager::UserSessionStateObserver::~UserSessionStateObserver() { 52 UserManager::UserSessionStateObserver::~UserSessionStateObserver() {
53 } 53 }
54 54
55 UserManager::UserAccountData::UserAccountData(const string16& display_name, 55 UserManager::UserAccountData::UserAccountData(const base::string16& display_name ,
56 const string16& given_name, 56 const base::string16& given_name,
57 const std::string& locale) 57 const std::string& locale)
58 : display_name_(display_name), 58 : display_name_(display_name),
59 given_name_(given_name), 59 given_name_(given_name),
60 locale_(locale) { 60 locale_(locale) {
61 } 61 }
62 62
63 UserManager::UserAccountData::~UserAccountData() {} 63 UserManager::UserAccountData::~UserAccountData() {}
64 64
65 // static 65 // static
66 void UserManager::Initialize() { 66 void UserManager::Initialize() {
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 ScopedTestUserManager::ScopedTestUserManager() { 119 ScopedTestUserManager::ScopedTestUserManager() {
120 UserManager::Initialize(); 120 UserManager::Initialize();
121 } 121 }
122 122
123 ScopedTestUserManager::~ScopedTestUserManager() { 123 ScopedTestUserManager::~ScopedTestUserManager() {
124 UserManager::Get()->Shutdown(); 124 UserManager::Get()->Shutdown();
125 UserManager::Destroy(); 125 UserManager::Destroy();
126 } 126 }
127 127
128 } // namespace chromeos 128 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/user_manager.h ('k') | chrome/browser/chromeos/login/user_manager_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698