| Index: chrome/browser/chromeos/login/signin/merge_session_load_page.h
|
| diff --git a/chrome/browser/chromeos/login/merge_session_load_page.h b/chrome/browser/chromeos/login/signin/merge_session_load_page.h
|
| similarity index 86%
|
| rename from chrome/browser/chromeos/login/merge_session_load_page.h
|
| rename to chrome/browser/chromeos/login/signin/merge_session_load_page.h
|
| index 35defab497fb14e18ff1e65e35abe0be4be8951b..30222c064a6940565de119c4f07e4b57747c454b 100644
|
| --- a/chrome/browser/chromeos/login/merge_session_load_page.h
|
| +++ b/chrome/browser/chromeos/login/signin/merge_session_load_page.h
|
| @@ -2,15 +2,15 @@
|
| // 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_LOAD_PAGE_H_
|
| -#define CHROME_BROWSER_CHROMEOS_LOGIN_MERGE_SESSION_LOAD_PAGE_H_
|
| +#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_LOAD_PAGE_H_
|
| +#define CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_LOAD_PAGE_H_
|
|
|
| #include <string>
|
|
|
| #include "base/callback.h"
|
| #include "base/compiler_specific.h"
|
| -#include "chrome/browser/chromeos/login/merge_session_throttle.h"
|
| -#include "chrome/browser/chromeos/login/oauth2_login_manager.h"
|
| +#include "chrome/browser/chromeos/login/signin/merge_session_throttle.h"
|
| +#include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
|
| #include "content/public/browser/interstitial_page_delegate.h"
|
| #include "url/gurl.h"
|
|
|
| @@ -84,4 +84,4 @@ class MergeSessionLoadPage
|
|
|
| } // namespace chromeos
|
|
|
| -#endif // CHROME_BROWSER_CHROMEOS_LOGIN_MERGE_SESSION_LOAD_PAGE_H_
|
| +#endif // CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_LOAD_PAGE_H_
|
|
|