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

Side by Side Diff: chrome/browser/chromeos/login/signin/token_handle_util.h

Issue 1099383002: Change ScopedPtrHashMap's 2nd template parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_TOKEN_HANDLE_UTIL_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_TOKEN_HANDLE_UTIL_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_TOKEN_HANDLE_UTIL_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_TOKEN_HANDLE_UTIL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 81
82 void OnValidationComplete(const std::string& token); 82 void OnValidationComplete(const std::string& token);
83 void OnObtainTokenComplete(const user_manager::UserID& id); 83 void OnObtainTokenComplete(const user_manager::UserID& id);
84 void StoreTokenHandle(const user_manager::UserID& user_id, 84 void StoreTokenHandle(const user_manager::UserID& user_id,
85 const std::string& handle); 85 const std::string& handle);
86 86
87 // UserManager that stores corresponding user data. 87 // UserManager that stores corresponding user data.
88 user_manager::UserManager* user_manager_; 88 user_manager::UserManager* user_manager_;
89 89
90 // Map of pending check operations. 90 // Map of pending check operations.
91 base::ScopedPtrHashMap<std::string, TokenDelegate> validation_delegates_; 91 base::ScopedPtrHashMap<std::string, scoped_ptr<TokenDelegate>>
92 validation_delegates_;
92 93
93 // Map of pending obtain operations. 94 // Map of pending obtain operations.
94 base::ScopedPtrHashMap<user_manager::UserID, TokenDelegate> obtain_delegates_; 95 base::ScopedPtrHashMap<user_manager::UserID, scoped_ptr<TokenDelegate>>
96 obtain_delegates_;
95 97
96 // Instance of GAIA Client. 98 // Instance of GAIA Client.
97 scoped_ptr<gaia::GaiaOAuthClient> gaia_client_; 99 scoped_ptr<gaia::GaiaOAuthClient> gaia_client_;
98 100
99 base::WeakPtrFactory<TokenHandleUtil> weak_factory_; 101 base::WeakPtrFactory<TokenHandleUtil> weak_factory_;
100 102
101 DISALLOW_COPY_AND_ASSIGN(TokenHandleUtil); 103 DISALLOW_COPY_AND_ASSIGN(TokenHandleUtil);
102 }; 104 };
103 105
104 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_TOKEN_HANDLE_UTIL_H_ 106 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_TOKEN_HANDLE_UTIL_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/compositor/tab_content_manager.h ('k') | chrome/browser/chromeos/net/wake_on_wifi_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698