Skip to content

Commit

Permalink
Move //{chromeos/components => ash/webui}/help_app_ui
Browse files Browse the repository at this point in the history
Codes in //chromeos/components/help_app_ui are ChromeOS-specific WebUI,
so it is moved to //ash/webui. The path which holds CIPD packages in
src/DEPS and .gitignore is updated as well.

This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.

Bug: 1164001, 1215542
Change-Id: Ie41955096e570399f0cb59023e2e85a4465dcf78
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3121868
Commit-Queue: Yeunjoo Choi <ychoi@igalia.com>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Owners-Override: Hidehiko Abe <hidehiko@chromium.org>
Cr-Commit-Position: refs/heads/main@{#916675}
  • Loading branch information
duswnchl authored and Chromium LUCI CQ committed Aug 31, 2021
1 parent 940ae2d commit a53415d
Show file tree
Hide file tree
Showing 86 changed files with 245 additions and 242 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ vs-chromium-project.txt
/_out
/android_emulator_sdk
/ash/ash_unittests_run.xml
/ash/webui/help_app_ui/resources/prod
/base/base_unittests_run.xml
# See build/.gitignore for entries covering src/build.

Expand Down
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -1689,7 +1689,7 @@ deps = {
'dep_type': 'cipd',
},

'src/chromeos/components/help_app_ui/resources/prod': {
'src/ash/webui/help_app_ui/resources/prod': {
'packages': [
{
'package': 'chromeos_internal/apps/help_app/app',
Expand Down
2 changes: 2 additions & 0 deletions ash/webui/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ test("ash_webui_unittests") {
"//ash/webui/common/backend:unit_tests",
"//ash/webui/diagnostics_ui/backend:unit_tests",
"//ash/webui/diagnostics_ui/mojom:unit_tests",
"//ash/webui/help_app_ui:unit_tests",
"//ash/webui/scanning:unit_tests",
"//ash/webui/shimless_rma/backend:unit_tests",
"//ash/webui/shimless_rma/mojom:unit_tests",
Expand Down Expand Up @@ -48,6 +49,7 @@ group("closure_compile") {
deps = [
"//ash/webui/diagnostics_ui:closure_compile",
"//ash/webui/file_manager/resources:closure_compile",
"//ash/webui/help_app_ui:closure_compile",
"//ash/webui/os_feedback_ui:closure_compile",
"//ash/webui/scanning:closure_compile",
"//ash/webui/shimless_rma:closure_compile",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

import("//ash/webui/help_app_ui/help_app_ui.gni")
import("//build/buildflag_header.gni")
import("//chrome/test/base/js2gtest.gni")
import("//chromeos/components/help_app_ui/help_app_ui.gni")
import("//chromeos/components/web_applications/system_apps.gni")
import("//mojo/public/tools/bindings/mojom.gni")
import("//third_party/closure_compiler/compile_js.gni")
Expand Down Expand Up @@ -40,15 +40,15 @@ static_library("help_app_ui") {
":mojo_bindings",
":mojo_bindings_js",
"//ash/constants",
"//chromeos/components/help_app_ui/search:mojo_bindings",
"//chromeos/components/help_app_ui/search:mojo_bindings_js",
"//ash/webui/help_app_ui/search:mojo_bindings",
"//ash/webui/help_app_ui/search:mojo_bindings_js",
"//ash/webui/resources:help_app_bundle_resources",
"//ash/webui/resources:help_app_kids_magazine_bundle_resources",
"//ash/webui/resources:help_app_resources",
"//chromeos/components/local_search_service/public/cpp",
"//chromeos/components/local_search_service/public/mojom",
"//chromeos/components/local_search_service/public/mojom:mojom_js",
"//chromeos/components/web_applications",
"//chromeos/resources:help_app_bundle_resources",
"//chromeos/resources:help_app_kids_magazine_bundle_resources",
"//chromeos/resources:help_app_resources",
"//chromeos/strings",
"//chromeos/system",
"//components/keyed_service/content:content",
Expand Down Expand Up @@ -76,8 +76,8 @@ source_set("unit_tests") {

deps = [
":help_app_ui",
"//ash/webui/help_app_ui/search:mojo_bindings",
"//base/test:test_support",
"//chromeos/components/help_app_ui/search:mojo_bindings",
"//chromeos/components/local_search_service/public/mojom:mojom",
"//mojo/public/cpp/bindings:bindings",
"//testing/gtest",
Expand Down Expand Up @@ -163,7 +163,7 @@ js_library("test_guest_query_receiver_js") {
sources = [ "test/guest_query_receiver.js" ]
deps = [
":test_driver_api_js",
"//chromeos/components/help_app_ui/resources:receiver",
"//ash/webui/help_app_ui/resources:receiver",
"//chromeos/components/system_apps/public/js:message_pipe",
]
}
Expand All @@ -174,7 +174,7 @@ js_library("test_driver_js") {
externs_list = [ "//third_party/chaijs/externs/chai-3.5.js" ]
deps = [
":test_driver_api_js",
"//chromeos/components/help_app_ui/resources:browser_proxy",
"//ash/webui/help_app_ui/resources:browser_proxy",
"//chromeos/components/system_apps/public/js:message_pipe",
]
}
Expand All @@ -192,7 +192,7 @@ js_library("test_help_app_ui_browsertest_js") {
sources = [ "test/help_app_ui_browsertest.js" ]
deps = [
":test_driver_js",
"//chromeos/components/help_app_ui/resources:browser_proxy",
"//ash/webui/help_app_ui/resources:browser_proxy",
"//chromeos/components/system_apps/public/js:message_pipe",
]
}
Expand All @@ -204,7 +204,7 @@ js_library("test_help_app_guest_ui_browsertest_js") {
[ "//chromeos/components/web_applications/js2gtest_support.externs.js" ]
deps = [
":test_driver_js",
"//chromeos/components/help_app_ui/resources:receiver",
"//ash/webui/help_app_ui/resources:receiver",
"//chromeos/components/system_apps/public/js:message_pipe",
]
}
Expand Down
14 changes: 14 additions & 0 deletions ash/webui/help_app_ui/DEPS
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
include_rules = [
# Do not add chrome here (use a delegate instead).
"+chromeos/grit/chromeos_help_app_bundle_resources.h",
"+chromeos/grit/chromeos_help_app_bundle_resources_map.h",
"+chromeos/grit/chromeos_help_app_kids_magazine_bundle_resources.h",
"+chromeos/grit/chromeos_help_app_kids_magazine_bundle_resources_map.h",
"+components/content_settings/core/common",
"+components/keyed_service/content",
"+components/keyed_service/core",

# TODO(https://crbug.com/1164001): Remove when these move to ash.
"+chromeos/components/local_search_service",
"+chromeos/components/web_applications",
]
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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 "chromeos/components/help_app_ui/help_app_kids_magazine_untrusted_ui.h"
#include "ash/webui/help_app_ui/help_app_kids_magazine_untrusted_ui.h"

#include "ash/webui/help_app_ui/url_constants.h"
#include "base/strings/string_piece.h"
#include "chromeos/components/help_app_ui/url_constants.h"
#include "chromeos/grit/chromeos_help_app_kids_magazine_bundle_resources.h"
#include "chromeos/grit/chromeos_help_app_kids_magazine_bundle_resources_map.h"
#include "content/public/browser/web_contents.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 CHROMEOS_COMPONENTS_HELP_APP_UI_HELP_APP_KIDS_MAGAZINE_UNTRUSTED_UI_H_
#define CHROMEOS_COMPONENTS_HELP_APP_UI_HELP_APP_KIDS_MAGAZINE_UNTRUSTED_UI_H_
#ifndef ASH_WEBUI_HELP_APP_UI_HELP_APP_KIDS_MAGAZINE_UNTRUSTED_UI_H_
#define ASH_WEBUI_HELP_APP_UI_HELP_APP_KIDS_MAGAZINE_UNTRUSTED_UI_H_

#include "ui/webui/untrusted_web_ui_controller.h"
#include "ui/webui/webui_config.h"
Expand Down Expand Up @@ -32,4 +32,4 @@ class HelpAppKidsMagazineUntrustedUI : public ui::UntrustedWebUIController {

} // namespace chromeos

#endif // CHROMEOS_COMPONENTS_HELP_APP_UI_HELP_APP_KIDS_MAGAZINE_UNTRUSTED_UI_H_
#endif // ASH_WEBUI_HELP_APP_UI_HELP_APP_KIDS_MAGAZINE_UNTRUSTED_UI_H_
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "chromeos/components/help_app_ui/help_app_manager.h"
#include "ash/webui/help_app_ui/help_app_manager.h"

#include "ash/webui/help_app_ui/search/search_handler.h"
#include "ash/webui/help_app_ui/search/search_tag_registry.h"
#include "base/bind.h"
#include "base/feature_list.h"
#include "chromeos/components/help_app_ui/search/search_handler.h"
#include "chromeos/components/help_app_ui/search/search_tag_registry.h"
#include "content/public/browser/web_ui_data_source.h"

namespace chromeos {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 CHROMEOS_COMPONENTS_HELP_APP_UI_HELP_APP_MANAGER_H_
#define CHROMEOS_COMPONENTS_HELP_APP_UI_HELP_APP_MANAGER_H_
#ifndef ASH_WEBUI_HELP_APP_UI_HELP_APP_MANAGER_H_
#define ASH_WEBUI_HELP_APP_UI_HELP_APP_MANAGER_H_

#include "components/keyed_service/core/keyed_service.h"

Expand Down Expand Up @@ -51,4 +51,4 @@ class HelpAppManager : public KeyedService {
} // namespace help_app
} // namespace chromeos

#endif // CHROMEOS_COMPONENTS_HELP_APP_UI_HELP_APP_MANAGER_H_
#endif // ASH_WEBUI_HELP_APP_UI_HELP_APP_MANAGER_H_
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "chromeos/components/help_app_ui/help_app_manager_factory.h"
#include "chromeos/components/help_app_ui/help_app_manager.h"
#include "ash/webui/help_app_ui/help_app_manager_factory.h"
#include "ash/webui/help_app_ui/help_app_manager.h"
#include "chromeos/components/local_search_service/public/cpp/local_search_service_proxy_factory.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 CHROMEOS_COMPONENTS_HELP_APP_UI_HELP_APP_MANAGER_FACTORY_H_
#define CHROMEOS_COMPONENTS_HELP_APP_UI_HELP_APP_MANAGER_FACTORY_H_
#ifndef ASH_WEBUI_HELP_APP_UI_HELP_APP_MANAGER_FACTORY_H_
#define ASH_WEBUI_HELP_APP_UI_HELP_APP_MANAGER_FACTORY_H_

#include "base/memory/singleton.h"
#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
Expand Down Expand Up @@ -38,4 +38,4 @@ class HelpAppManagerFactory : public BrowserContextKeyedServiceFactory {
} // namespace help_app
} // namespace chromeos

#endif // CHROMEOS_COMPONENTS_HELP_APP_UI_HELP_APP_MANAGER_FACTORY_H_
#endif // ASH_WEBUI_HELP_APP_UI_HELP_APP_MANAGER_FACTORY_H_
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "chromeos/components/help_app_ui/help_app_page_handler.h"
#include "ash/webui/help_app_ui/help_app_page_handler.h"

#include <utility>

#include "ash/constants/ash_features.h"
#include "ash/webui/help_app_ui/help_app_ui.h"
#include "ash/webui/help_app_ui/help_app_ui_delegate.h"
#include "base/feature_list.h"
#include "chromeos/components/help_app_ui/help_app_ui.h"
#include "chromeos/components/help_app_ui/help_app_ui_delegate.h"

HelpAppPageHandler::HelpAppPageHandler(
chromeos::HelpAppUI* help_app_ui,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef CHROMEOS_COMPONENTS_HELP_APP_UI_HELP_APP_PAGE_HANDLER_H_
#define CHROMEOS_COMPONENTS_HELP_APP_UI_HELP_APP_PAGE_HANDLER_H_
#ifndef ASH_WEBUI_HELP_APP_UI_HELP_APP_PAGE_HANDLER_H_
#define ASH_WEBUI_HELP_APP_UI_HELP_APP_PAGE_HANDLER_H_

#include "chromeos/components/help_app_ui/help_app_ui.mojom.h"
#include "ash/webui/help_app_ui/help_app_ui.mojom.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/receiver.h"

Expand Down Expand Up @@ -41,4 +41,4 @@ class HelpAppPageHandler : public help_app_ui::mojom::PageHandler {
bool is_launcher_search_enabled_;
};

#endif // CHROMEOS_COMPONENTS_HELP_APP_UI_HELP_APP_PAGE_HANDLER_H_
#endif // ASH_WEBUI_HELP_APP_UI_HELP_APP_PAGE_HANDLER_H_
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "chromeos/components/help_app_ui/help_app_ui.h"
#include "ash/webui/help_app_ui/help_app_ui.h"

#include <utility>

#include "ash/constants/ash_features.h"
#include "chromeos/components/help_app_ui/help_app_manager.h"
#include "chromeos/components/help_app_ui/help_app_manager_factory.h"
#include "chromeos/components/help_app_ui/help_app_page_handler.h"
#include "chromeos/components/help_app_ui/help_app_untrusted_ui.h"
#include "chromeos/components/help_app_ui/search/search_handler.h"
#include "chromeos/components/help_app_ui/url_constants.h"
#include "ash/grit/ash_help_app_resources.h"
#include "ash/webui/help_app_ui/help_app_manager.h"
#include "ash/webui/help_app_ui/help_app_manager_factory.h"
#include "ash/webui/help_app_ui/help_app_page_handler.h"
#include "ash/webui/help_app_ui/help_app_untrusted_ui.h"
#include "ash/webui/help_app_ui/search/search_handler.h"
#include "ash/webui/help_app_ui/url_constants.h"
#include "chromeos/components/local_search_service/public/cpp/local_search_service_proxy.h"
#include "chromeos/components/local_search_service/public/cpp/local_search_service_proxy_factory.h"
#include "chromeos/components/local_search_service/public/mojom/types.mojom.h"
#include "chromeos/components/web_applications/webui_test_prod_util.h"
#include "chromeos/grit/chromeos_help_app_resources.h"
#include "chromeos/strings/grit/chromeos_strings.h"
#include "components/content_settings/core/common/content_settings_types.h"
#include "content/public/browser/web_contents.h"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef CHROMEOS_COMPONENTS_HELP_APP_UI_HELP_APP_UI_H_
#define CHROMEOS_COMPONENTS_HELP_APP_UI_HELP_APP_UI_H_
#ifndef ASH_WEBUI_HELP_APP_UI_HELP_APP_UI_H_
#define ASH_WEBUI_HELP_APP_UI_HELP_APP_UI_H_

#include <memory>

#include "chromeos/components/help_app_ui/help_app_ui.mojom.h"
#include "chromeos/components/help_app_ui/help_app_ui_delegate.h"
#include "chromeos/components/help_app_ui/search/search.mojom.h"
#include "ash/webui/help_app_ui/help_app_ui.mojom.h"
#include "ash/webui/help_app_ui/help_app_ui_delegate.h"
#include "ash/webui/help_app_ui/search/search.mojom.h"
#include "chromeos/components/local_search_service/public/mojom/index.mojom.h"
#include "mojo/public/cpp/bindings/receiver.h"
#include "ui/webui/mojo_web_ui_controller.h"
Expand Down Expand Up @@ -58,4 +58,4 @@ class HelpAppUI : public ui::MojoWebUIController,

} // namespace chromeos

#endif // CHROMEOS_COMPONENTS_HELP_APP_UI_HELP_APP_UI_H_
#endif // ASH_WEBUI_HELP_APP_UI_HELP_APP_UI_H_
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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 CHROMEOS_COMPONENTS_HELP_APP_UI_HELP_APP_UI_DELEGATE_H_
#define CHROMEOS_COMPONENTS_HELP_APP_UI_HELP_APP_UI_DELEGATE_H_
#ifndef ASH_WEBUI_HELP_APP_UI_HELP_APP_UI_DELEGATE_H_
#define ASH_WEBUI_HELP_APP_UI_HELP_APP_UI_DELEGATE_H_

#include <string>

Expand Down Expand Up @@ -39,4 +39,4 @@ class HelpAppUIDelegate {
virtual void MaybeShowReleaseNotesNotification() = 0;
};

#endif // CHROMEOS_COMPONENTS_HELP_APP_UI_HELP_APP_UI_DELEGATE_H_
#endif // ASH_WEBUI_HELP_APP_UI_HELP_APP_UI_DELEGATE_H_
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "chromeos/components/help_app_ui/help_app_untrusted_ui.h"
#include "ash/webui/help_app_ui/help_app_untrusted_ui.h"

#include "chromeos/components/help_app_ui/url_constants.h"
#include "ash/grit/ash_help_app_resources.h"
#include "ash/webui/help_app_ui/url_constants.h"
#include "chromeos/components/web_applications/webui_test_prod_util.h"
#include "chromeos/grit/chromeos_help_app_bundle_resources.h"
#include "chromeos/grit/chromeos_help_app_bundle_resources_map.h"
#include "chromeos/grit/chromeos_help_app_resources.h"
#include "chromeos/strings/grit/chromeos_strings.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 CHROMEOS_COMPONENTS_HELP_APP_UI_HELP_APP_UNTRUSTED_UI_H_
#define CHROMEOS_COMPONENTS_HELP_APP_UI_HELP_APP_UNTRUSTED_UI_H_
#ifndef ASH_WEBUI_HELP_APP_UI_HELP_APP_UNTRUSTED_UI_H_
#define ASH_WEBUI_HELP_APP_UI_HELP_APP_UNTRUSTED_UI_H_

#include "base/callback.h"
#include "ui/webui/untrusted_web_ui_controller.h"
Expand All @@ -28,4 +28,4 @@ class HelpAppUntrustedUI : public ui::UntrustedWebUIController {

} // namespace chromeos

#endif // CHROMEOS_COMPONENTS_HELP_APP_UI_HELP_APP_UNTRUSTED_UI_H_
#endif // ASH_WEBUI_HELP_APP_UI_HELP_APP_UNTRUSTED_UI_H_
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ copy("stage_static") {

copy("stage_generated") {
sources = [
"$target_gen_dir/../../local_search_service/public/mojom/index.mojom-lite.js",
"$target_gen_dir/../../local_search_service/public/mojom/types.mojom-lite.js",
"$target_gen_dir/../../system_apps/public/js/message_pipe.m.js",
"$target_gen_dir/../../../../chromeos/components/local_search_service/public/mojom/index.mojom-lite.js",
"$target_gen_dir/../../../../chromeos/components/local_search_service/public/mojom/types.mojom-lite.js",
"$target_gen_dir/../../../../chromeos/components/system_apps/public/js/message_pipe.m.js",
"$target_gen_dir/../help_app_ui.mojom-lite.js",
"$target_gen_dir/../search/search.mojom-lite.js",
]
outputs = [ stage_folder + "/{{source_file_part}}" ]
deps = [
"//chromeos/components/help_app_ui:mojo_bindings_js",
"//chromeos/components/help_app_ui/search:mojo_bindings_js__generator",
"//ash/webui/help_app_ui:mojo_bindings_js",
"//ash/webui/help_app_ui/search:mojo_bindings_js__generator",
"//chromeos/components/local_search_service/public/mojom:mojom_js__generator",
"//chromeos/components/system_apps/public/js:modulize",
]
Expand Down Expand Up @@ -92,8 +92,8 @@ js_library("browser_proxy") {
]
deps = [
":message_types",
"//chromeos/components/help_app_ui:mojo_bindings_js_library_for_compile",
"//chromeos/components/help_app_ui/search:mojo_bindings_js_library_for_compile",
"//ash/webui/help_app_ui:mojo_bindings_js_library_for_compile",
"//ash/webui/help_app_ui/search:mojo_bindings_js_library_for_compile",
"//chromeos/components/local_search_service/public/mojom:mojom_js_library_for_compile",
"//chromeos/components/system_apps/public/js:message_pipe.m",
]
Expand Down
File renamed without changes.
Loading

0 comments on commit a53415d

Please sign in to comment.