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

Side by Side Diff: chrome/browser/chromeos/login/google_authenticator.cc

Issue 3447008: base: Finish moving the SplitString functions from string_util.h to string_split.h (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: chromeos fixes Created 10 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/google_authenticator.h" 5 #include "chrome/browser/chromeos/login/google_authenticator.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/file_path.h" 10 #include "base/file_path.h"
11 #include "base/file_util.h" 11 #include "base/file_util.h"
12 #include "base/lock.h" 12 #include "base/lock.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/sha2.h" 15 #include "base/sha2.h"
16 #include "base/string_split.h"
16 #include "base/string_util.h" 17 #include "base/string_util.h"
17 #include "base/third_party/nss/blapi.h" 18 #include "base/third_party/nss/blapi.h"
18 #include "base/third_party/nss/sha256.h" 19 #include "base/third_party/nss/sha256.h"
19 #include "chrome/browser/browser_process.h" 20 #include "chrome/browser/browser_process.h"
20 #include "chrome/browser/chrome_thread.h" 21 #include "chrome/browser/chrome_thread.h"
21 #include "chrome/browser/chromeos/cros/cryptohome_library.h" 22 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
22 #include "chrome/browser/chromeos/login/auth_response_handler.h" 23 #include "chrome/browser/chromeos/login/auth_response_handler.h"
23 #include "chrome/browser/chromeos/login/authentication_notification_details.h" 24 #include "chrome/browser/chromeos/login/authentication_notification_details.h"
24 #include "chrome/browser/chromeos/login/login_status_consumer.h" 25 #include "chrome/browser/chromeos/login/login_status_consumer.h"
25 #include "chrome/browser/chromeos/login/ownership_service.h" 26 #include "chrome/browser/chromeos/login/ownership_service.h"
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 DCHECK_EQ(parts.size(), 2U) << "email_address should have only one @"; 444 DCHECK_EQ(parts.size(), 2U) << "email_address should have only one @";
444 RemoveChars(parts[0], ".", &parts[0]); 445 RemoveChars(parts[0], ".", &parts[0]);
445 if (parts[0].find('+') != std::string::npos) 446 if (parts[0].find('+') != std::string::npos)
446 parts[0].erase(parts[0].find('+')); 447 parts[0].erase(parts[0].find('+'));
447 std::string new_email = StringToLowerASCII(JoinString(parts, at)); 448 std::string new_email = StringToLowerASCII(JoinString(parts, at));
448 LOG(INFO) << "Canonicalized " << email_address << " to " << new_email; 449 LOG(INFO) << "Canonicalized " << email_address << " to " << new_email;
449 return new_email; 450 return new_email;
450 } 451 }
451 452
452 } // namespace chromeos 453 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_util.cc ('k') | chrome/browser/chromeos/options/language_config_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698