| Index: chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.h
|
| diff --git a/chrome/browser/chromeos/login/merge_session_xhr_request_waiter.h b/chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.h
|
| similarity index 68%
|
| rename from chrome/browser/chromeos/login/merge_session_xhr_request_waiter.h
|
| rename to chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.h
|
| index 992d7fe5899e1c76ba38b9f493f75995de4ae9d3..130fe4c047506ad0cde0348290f3c5445566bed7 100644
|
| --- a/chrome/browser/chromeos/login/merge_session_xhr_request_waiter.h
|
| +++ b/chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.h
|
| @@ -2,18 +2,18 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_MERGE_SESSION_XHR_REQUEST_WAITER_H_
|
| -#define CHROME_BROWSER_CHROMEOS_LOGIN_MERGE_SESSION_XHR_REQUEST_WAITER_H_
|
| +#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_XHR_REQUEST_WAITER_H_
|
| +#define CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_XHR_REQUEST_WAITER_H_
|
|
|
| -#include "chrome/browser/chromeos/login/merge_session_xhr_request_waiter.h"
|
| +#include "chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.h"
|
|
|
| #include "base/bind.h"
|
| #include "base/lazy_instance.h"
|
| #include "base/logging.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "chrome/browser/chromeos/login/merge_session_throttle.h"
|
| -#include "chrome/browser/chromeos/login/oauth2_login_manager.h"
|
| -#include "chrome/browser/chromeos/login/oauth2_login_manager_factory.h"
|
| +#include "chrome/browser/chromeos/login/signin/merge_session_throttle.h"
|
| +#include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
|
| +#include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
|
|
|
| class Profile;
|
|
|
| @@ -50,4 +50,4 @@ class MergeSessionXHRRequestWaiter : public OAuth2LoginManager::Observer {
|
|
|
| } // namespace chromeos
|
|
|
| -#endif // CHROME_BROWSER_CHROMEOS_LOGIN_MERGE_SESSION_XHR_REQUEST_WAITER_H_
|
| +#endif // CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_XHR_REQUEST_WAITER_H_
|
|
|