| Index: chrome/browser/chromeos/login/signin/merge_session_load_page.cc
|
| diff --git a/chrome/browser/chromeos/login/merge_session_load_page.cc b/chrome/browser/chromeos/login/signin/merge_session_load_page.cc
|
| similarity index 97%
|
| rename from chrome/browser/chromeos/login/merge_session_load_page.cc
|
| rename to chrome/browser/chromeos/login/signin/merge_session_load_page.cc
|
| index eb56503011db8e9eeaffa20a79c08a27c26594e8..d120b76307a05909e73d368c8db560030a34f190 100644
|
| --- a/chrome/browser/chromeos/login/merge_session_load_page.cc
|
| +++ b/chrome/browser/chromeos/login/signin/merge_session_load_page.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/chromeos/login/merge_session_load_page.h"
|
| +#include "chrome/browser/chromeos/login/signin/merge_session_load_page.h"
|
|
|
| #include "ash/shell.h"
|
| #include "ash/shell_delegate.h"
|
| @@ -14,7 +14,7 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/values.h"
|
| #include "chrome/browser/chrome_notification_types.h"
|
| -#include "chrome/browser/chromeos/login/oauth2_login_manager_factory.h"
|
| +#include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/renderer_preferences_util.h"
|
|
|