Add account_manager/ folder in ui/webui/chromeos

Move account_manager_* and account_migration_* files to
ui/webui/chromeos/account_manager.

Bug: 1083147
Change-Id: I2f61237cf4b781a8ddd0ed8837e690e7f59adac1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2207226
Commit-Queue: Anastasiia N <anastasiian@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Kush Sinha <sinhak@chromium.org>
Cr-Commit-Position: refs/heads/master@{#772224}

chrome/browser/chromeos/login/signin/signin_error_notifier_ash.cc

@@ -32,7 +32,7 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/settings_window_manager_chromeos.h"
-#include "chrome/browser/ui/webui/chromeos/account_manager_welcome_dialog.h"
+#include "chrome/browser/ui/webui/chromeos/account_manager/account_manager_welcome_dialog.h"
 #include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"

chrome/browser/ui/BUILD.gn

@@ -1741,16 +1741,16 @@ static_library("ui") {
       "views/touch_selection_menu_runner_chromeos.h",
       "webui/certificate_provisioning_ui_handler.cc",
       "webui/certificate_provisioning_ui_handler.h",
-      "webui/chromeos/account_manager_error_ui.cc",
-      "webui/chromeos/account_manager_error_ui.h",
-      "webui/chromeos/account_manager_welcome_dialog.cc",
-      "webui/chromeos/account_manager_welcome_dialog.h",
-      "webui/chromeos/account_manager_welcome_ui.cc",
-      "webui/chromeos/account_manager_welcome_ui.h",
-      "webui/chromeos/account_migration_welcome_dialog.cc",
-      "webui/chromeos/account_migration_welcome_dialog.h",
-      "webui/chromeos/account_migration_welcome_ui.cc",
-      "webui/chromeos/account_migration_welcome_ui.h",
+      "webui/chromeos/account_manager/account_manager_error_ui.cc",
+      "webui/chromeos/account_manager/account_manager_error_ui.h",
+      "webui/chromeos/account_manager/account_manager_welcome_dialog.cc",
+      "webui/chromeos/account_manager/account_manager_welcome_dialog.h",
+      "webui/chromeos/account_manager/account_manager_welcome_ui.cc",
+      "webui/chromeos/account_manager/account_manager_welcome_ui.h",
+      "webui/chromeos/account_manager/account_migration_welcome_dialog.cc",
+      "webui/chromeos/account_manager/account_migration_welcome_dialog.h",
+      "webui/chromeos/account_manager/account_migration_welcome_ui.cc",
+      "webui/chromeos/account_manager/account_migration_welcome_ui.h",
       "webui/chromeos/add_supervision/add_supervision_handler.cc",
       "webui/chromeos/add_supervision/add_supervision_handler.h",
       "webui/chromeos/add_supervision/add_supervision_handler_utils.cc",

chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -29,9 +29,9 @@
 #include "chrome/browser/ui/webui/autofill_and_password_manager_internals/password_manager_internals_ui.h"
 #include "chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.h"
 #include "chrome/browser/ui/webui/chrome_url_disabled_ui.h"
-#include "chrome/browser/ui/webui/chromeos/account_manager_error_ui.h"
-#include "chrome/browser/ui/webui/chromeos/account_manager_welcome_ui.h"
-#include "chrome/browser/ui/webui/chromeos/account_migration_welcome_ui.h"
+#include "chrome/browser/ui/webui/chromeos/account_manager/account_manager_error_ui.h"
+#include "chrome/browser/ui/webui/chromeos/account_manager/account_manager_welcome_ui.h"
+#include "chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_ui.h"
 #include "chrome/browser/ui/webui/chromeos/camera/camera_ui.h"
 #include "chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_ui.h"
 #include "chrome/browser/ui/webui/components/components_ui.h"

chrome/browser/ui/webui/chromeos/account_manager/OWNERS

+anastasiian@chromium.org
+sinhak@chromium.org

chrome/browser/ui/webui/chromeos/account_manager_error_ui.cc → chrome/browser/ui/webui/chromeos/account_manager/account_manager_error_ui.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/ui/webui/chromeos/account_manager_error_ui.h"
+#include "chrome/browser/ui/webui/chromeos/account_manager/account_manager_error_ui.h"
 
 #include "base/bind.h"
 #include "build/branding_buildflags.h"

chrome/browser/ui/webui/chromeos/account_manager_error_ui.h → chrome/browser/ui/webui/chromeos/account_manager/account_manager_error_ui.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_ERROR_UI_H_
-#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_ERROR_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_ACCOUNT_MANAGER_ERROR_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_ACCOUNT_MANAGER_ERROR_UI_H_
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
@@ -25,4 +25,4 @@ class AccountManagerErrorUI : public ui::WebDialogUI {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_ERROR_UI_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_ACCOUNT_MANAGER_ERROR_UI_H_

chrome/browser/ui/webui/chromeos/account_manager_welcome_dialog.cc → chrome/browser/ui/webui/chromeos/account_manager/account_manager_welcome_dialog.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/ui/webui/chromeos/account_manager_welcome_dialog.h"
+#include "chrome/browser/ui/webui/chromeos/account_manager/account_manager_welcome_dialog.h"
 
 #include <string>
 

chrome/browser/ui/webui/chromeos/account_manager_welcome_dialog.h → chrome/browser/ui/webui/chromeos/account_manager/account_manager_welcome_dialog.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_WELCOME_DIALOG_H_
-#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_WELCOME_DIALOG_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_ACCOUNT_MANAGER_WELCOME_DIALOG_H_
+#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_ACCOUNT_MANAGER_WELCOME_DIALOG_H_
 
 #include <string>
 
@@ -37,4 +37,4 @@ class AccountManagerWelcomeDialog : public SystemWebDialogDelegate {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_WELCOME_DIALOG_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_ACCOUNT_MANAGER_WELCOME_DIALOG_H_

chrome/browser/ui/webui/chromeos/account_manager_welcome_ui.cc → chrome/browser/ui/webui/chromeos/account_manager/account_manager_welcome_ui.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/ui/webui/chromeos/account_manager_welcome_ui.h"
+#include "chrome/browser/ui/webui/chromeos/account_manager/account_manager_welcome_ui.h"
 
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"

chrome/browser/ui/webui/chromeos/account_manager_welcome_ui.h → chrome/browser/ui/webui/chromeos/account_manager/account_manager_welcome_ui.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_WELCOME_UI_H_
-#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_WELCOME_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_ACCOUNT_MANAGER_WELCOME_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_ACCOUNT_MANAGER_WELCOME_UI_H_
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
@@ -24,4 +24,4 @@ class AccountManagerWelcomeUI : public ui::WebDialogUI {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_WELCOME_UI_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_ACCOUNT_MANAGER_WELCOME_UI_H_

chrome/browser/ui/webui/chromeos/account_migration_welcome_dialog.cc → chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_dialog.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/ui/webui/chromeos/account_migration_welcome_dialog.h"
+#include "chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_dialog.h"
 
 #include <string>
 
@@ -10,7 +10,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/settings_window_manager_chromeos.h"
-#include "chrome/browser/ui/webui/chromeos/account_migration_welcome_ui.h"
+#include "chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_ui.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/webui_url_constants.h"
 #include "components/prefs/pref_service.h"

chrome/browser/ui/webui/chromeos/account_migration_welcome_dialog.h → chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_dialog.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MIGRATION_WELCOME_DIALOG_H_
-#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MIGRATION_WELCOME_DIALOG_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_ACCOUNT_MIGRATION_WELCOME_DIALOG_H_
+#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_ACCOUNT_MIGRATION_WELCOME_DIALOG_H_
 
 #include <string>
 
@@ -42,4 +42,4 @@ class AccountMigrationWelcomeDialog : public SystemWebDialogDelegate {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MIGRATION_WELCOME_DIALOG_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_ACCOUNT_MIGRATION_WELCOME_DIALOG_H_

chrome/browser/ui/webui/chromeos/account_migration_welcome_test.js → chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_test.js

@@ -71,7 +71,7 @@ AccountMigrationWelcomeUITest.prototype = {
   },
 };
 
-GEN('#include "chrome/browser/ui/webui/chromeos/account_migration_welcome_ui_test.h"');
+GEN('#include "chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_ui_test.h"');
 GEN('');
 
 

chrome/browser/ui/webui/chromeos/account_migration_welcome_ui.cc → chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_ui.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/ui/webui/chromeos/account_migration_welcome_ui.h"
+#include "chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_ui.h"
 
 #include <memory>
 #include <string>

chrome/browser/ui/webui/chromeos/account_migration_welcome_ui.h → chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_ui.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MIGRATION_WELCOME_UI_H_
-#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MIGRATION_WELCOME_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_ACCOUNT_MIGRATION_WELCOME_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_ACCOUNT_MIGRATION_WELCOME_UI_H_
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
@@ -26,4 +26,4 @@ class AccountMigrationWelcomeUI : public ui::WebDialogUI {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MIGRATION_WELCOME_UI_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_ACCOUNT_MIGRATION_WELCOME_UI_H_

chrome/browser/ui/webui/chromeos/account_migration_welcome_ui_test.cc → chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_ui_test.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/webui/chromeos/account_migration_welcome_ui_test.h"
+#include "chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_ui_test.h"
 
 #include "base/macros.h"
-#include "chrome/browser/ui/webui/chromeos/account_migration_welcome_dialog.h"
+#include "chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_dialog.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"

chrome/browser/ui/webui/chromeos/account_migration_welcome_ui_test.h → chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_ui_test.h

@@ -2,13 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MIGRATION_WELCOME_UI_TEST_H_
-#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MIGRATION_WELCOME_UI_TEST_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_ACCOUNT_MIGRATION_WELCOME_UI_TEST_H_
+#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_ACCOUNT_MIGRATION_WELCOME_UI_TEST_H_
 
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/base/web_ui_browser_test.h"
 // Test framework for
-// chrome/browser/ui/webui/chromeos/account_migration_welcome_test.js
+// chrome/browser/ui/webui/chromeos/account_manager/account_manager/
+// account_migration_welcome_test.js
 class AccountMigrationWelcomeUITest : public WebUIBrowserTest {
  public:
   AccountMigrationWelcomeUITest();
@@ -18,4 +19,4 @@ class AccountMigrationWelcomeUITest : public WebUIBrowserTest {
   void ShowDialog();
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MIGRATION_WELCOME_UI_TEST_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_ACCOUNT_MANAGER_ACCOUNT_MIGRATION_WELCOME_UI_TEST_H_

chrome/browser/ui/webui/settings/chromeos/account_manager_handler.cc

@@ -17,8 +17,8 @@
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/chromeos/account_manager_welcome_dialog.h"
-#include "chrome/browser/ui/webui/chromeos/account_migration_welcome_dialog.h"
+#include "chrome/browser/ui/webui/chromeos/account_manager/account_manager_welcome_dialog.h"
+#include "chrome/browser/ui/webui/chromeos/account_manager/account_migration_welcome_dialog.h"
 #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
 #include "chrome/browser/ui/webui/signin/inline_login_handler_dialog_chromeos.h"
 #include "chrome/grit/generated_resources.h"

chrome/test/BUILD.gn

@@ -1330,8 +1330,8 @@ if (!is_android) {
       "../browser/ui/webui/bookmarks/bookmarks_browsertest.h",
       "../browser/ui/webui/chrome_url_data_manager_browsertest.cc",
       "../browser/ui/webui/chrome_webui_navigation_browsertest.cc",
-      "../browser/ui/webui/chromeos/account_migration_welcome_ui_test.cc",
-      "../browser/ui/webui/chromeos/account_migration_welcome_ui_test.h",
+      "../browser/ui/webui/chromeos/account_manager/account_migration_welcome_ui_test.cc",
+      "../browser/ui/webui/chromeos/account_manager/account_migration_welcome_ui_test.h",
       "../browser/ui/webui/chromeos/bluetooth_pairing_dialog_browsertest-inl.h",
       "../browser/ui/webui/chromeos/machine_learning/machine_learning_internals_browsertest.cc",
       "../browser/ui/webui/chromeos/machine_learning/machine_learning_internals_browsertest.h",

chrome/test/data/webui/BUILD.gn

@@ -119,13 +119,13 @@ js2gtest("browser_tests_js_webui") {
     "settings/test_password_manager_proxy.js",
     "settings/passwords_and_autofill_fake_data.js",
     "//chrome/browser/resources/signin/sync_confirmation/sync_confirmation_browser_proxy.js",
-    "//chrome/browser/ui/webui/chromeos/account_migration_proxy_test.js",
+    "//chrome/browser/ui/webui/chromeos/account_manager/account_migration_proxy_test.js",
   ]
 
   if (is_chromeos) {
     sources += [
       "../../../browser/resources/chromeos/login/security_token_pin_browsertest.js",
-      "../../../browser/ui/webui/chromeos/account_migration_welcome_test.js",
+      "../../../browser/ui/webui/chromeos/account_manager/account_migration_welcome_test.js",
       "../../../browser/ui/webui/chromeos/bluetooth_pairing_dialog_browsertest.js",
       "../../../browser/ui/webui/chromeos/certificate_manager_dialog_browsertest.js",
       "../chromeos/oobe_webui_browsertest.js",