| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_MERGE_SESSION_XHR_REQUEST_WAITER_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_XHR_REQUEST_WAITER_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_MERGE_SESSION_XHR_REQUEST_WAITER_H_ | 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_XHR_REQUEST_WAITER_H_ |
| 7 | 7 |
| 8 #include "chrome/browser/chromeos/login/merge_session_xhr_request_waiter.h" | 8 #include "chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.
h" |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| 11 #include "base/lazy_instance.h" | 11 #include "base/lazy_instance.h" |
| 12 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "base/memory/weak_ptr.h" | 13 #include "base/memory/weak_ptr.h" |
| 14 #include "chrome/browser/chromeos/login/merge_session_throttle.h" | 14 #include "chrome/browser/chromeos/login/signin/merge_session_throttle.h" |
| 15 #include "chrome/browser/chromeos/login/oauth2_login_manager.h" | 15 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h" |
| 16 #include "chrome/browser/chromeos/login/oauth2_login_manager_factory.h" | 16 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h" |
| 17 | 17 |
| 18 class Profile; | 18 class Profile; |
| 19 | 19 |
| 20 namespace chromeos { | 20 namespace chromeos { |
| 21 | 21 |
| 22 class MergeSessionXHRRequestWaiter : public OAuth2LoginManager::Observer { | 22 class MergeSessionXHRRequestWaiter : public OAuth2LoginManager::Observer { |
| 23 public: | 23 public: |
| 24 MergeSessionXHRRequestWaiter( | 24 MergeSessionXHRRequestWaiter( |
| 25 Profile* profile, | 25 Profile* profile, |
| 26 const MergeSessionThrottle::CompletionCallback& callback); | 26 const MergeSessionThrottle::CompletionCallback& callback); |
| (...skipping 16 matching lines...) Expand all Loading... |
| 43 | 43 |
| 44 Profile* profile_; | 44 Profile* profile_; |
| 45 MergeSessionThrottle::CompletionCallback callback_; | 45 MergeSessionThrottle::CompletionCallback callback_; |
| 46 base::WeakPtrFactory<MergeSessionXHRRequestWaiter> weak_ptr_factory_; | 46 base::WeakPtrFactory<MergeSessionXHRRequestWaiter> weak_ptr_factory_; |
| 47 | 47 |
| 48 DISALLOW_COPY_AND_ASSIGN(MergeSessionXHRRequestWaiter); | 48 DISALLOW_COPY_AND_ASSIGN(MergeSessionXHRRequestWaiter); |
| 49 }; | 49 }; |
| 50 | 50 |
| 51 } // namespace chromeos | 51 } // namespace chromeos |
| 52 | 52 |
| 53 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_MERGE_SESSION_XHR_REQUEST_WAITER_H_ | 53 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_XHR_REQUEST_WAITER
_H_ |
| OLD | NEW |