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

Unified Diff: chrome/browser/ui/webui/signin/user_manager_screen_handler.cc

Issue 114883004: Add base:: namespace to straggling string16s left in chrome/browser/ui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: found more 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
« no previous file with comments | « chrome/browser/ui/webui/performance_monitor/performance_monitor_l10n.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
index 53e48fe0b7efe3fd788d6341a2dd47e1fa344271..e69109d4208cc3685780a874472b603c73160ecb 100644
--- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
+++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
@@ -92,8 +92,8 @@ std::string GetAvatarImageAtIndex(
}
size_t GetIndexOfProfileWithEmailAndName(const ProfileInfoCache& info_cache,
- const string16& email,
- const string16& name) {
+ const base::string16& email,
+ const base::string16& name) {
for (size_t i = 0; i < info_cache.GetNumberOfProfiles(); ++i) {
if (info_cache.GetUserNameOfProfileAtIndex(i) == email &&
info_cache.GetNameOfProfileAtIndex(i) == name) {
@@ -190,11 +190,11 @@ void UserManagerScreenHandler::HandleAddUser(const base::ListValue* args) {
void UserManagerScreenHandler::HandleAuthenticatedLaunchUser(
const base::ListValue* args) {
- string16 email_address;
+ base::string16 email_address;
if (!args->GetString(0, &email_address))
return;
- string16 display_name;
+ base::string16 display_name;
if (!args->GetString(1, &display_name))
return;
@@ -256,11 +256,11 @@ void UserManagerScreenHandler::HandleLaunchGuest(const base::ListValue* args) {
}
void UserManagerScreenHandler::HandleLaunchUser(const base::ListValue* args) {
- base::string16 emailAddress;
- base::string16 displayName;
+ base::string16 email_address;
+ base::string16 display_name;
- if (!args->GetString(0, &emailAddress) ||
- !args->GetString(1, &displayName)) {
+ if (!args->GetString(0, &email_address) ||
+ !args->GetString(1, &display_name)) {
NOTREACHED();
return;
}
@@ -268,7 +268,7 @@ void UserManagerScreenHandler::HandleLaunchUser(const base::ListValue* args) {
ProfileInfoCache& info_cache =
g_browser_process->profile_manager()->GetProfileInfoCache();
size_t profile_index = GetIndexOfProfileWithEmailAndName(
- info_cache, emailAddress, displayName);
+ info_cache, email_address, display_name);
if (profile_index >= info_cache.GetNumberOfProfiles()) {
NOTREACHED();
« no previous file with comments | « chrome/browser/ui/webui/performance_monitor/performance_monitor_l10n.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698