0

Rename traits and mojo directory in //ash/public

This CL renames mojo to mojom and *_struct_traits.* to
*_mojom_traits.* in //ash/public.

*_struct_traits.* => *_mojom_traits.*
ash/public/interfaces => ash/public/mojom

Bug: 806965
Change-Id: Iaca4cfc425ccd95eeb653eb98e56d31cfd3c58bf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1722466
Reviewed-by: Colin Blundell <blundell@chromium.org>
Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Cr-Commit-Position: refs/heads/master@{#683548}
This commit is contained in:
Miyoung Shin
2019-08-02 12:23:50 +00:00
committed by Commit Bot
parent 0d1d098bc4
commit 7e1b1b1ea0
143 changed files with 164 additions and 166 deletions
ash
BUILD.gn
accelerators
app_list
assistant
display
ime
lock_screen_action
login
mojo_test_interface_factory.cc
public
shelf
shell
system
tray_action
wm
chrome
browser
DEPS
accessibility
ash_service_registry.ccbrowser_process_platform_part_chromeos.ccchrome_content_browser_client.cc
chromeos
extensions
feedback
resources
settings
google_assistant_page
ui
test
chromeos/services/assistant
components/arc/common
extensions/browser/api/feedback_private

@ -2277,7 +2277,7 @@ static_library("test_support") {
"//ash/components/fast_ink",
"//ash/public/cpp",
"//ash/public/cpp:test_support",
"//ash/public/interfaces:test_interfaces",
"//ash/public/mojom:test_interfaces",
"//base",
"//base:i18n",
"//base/test:test_support",

@ -26,7 +26,7 @@
#include "ash/public/cpp/ash_switches.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/public/cpp/test/shell_test_api.h"
#include "ash/public/interfaces/ime_info.mojom.h"
#include "ash/public/mojom/ime_info.mojom.h"
#include "ash/session/session_controller_impl.h"
#include "ash/session/test_session_controller_client.h"
#include "ash/shell.h"

@ -28,7 +28,7 @@
#include "ash/public/cpp/shelf_types.h"
#include "ash/public/cpp/tablet_mode_observer.h"
#include "ash/public/cpp/wallpaper_controller_observer.h"
#include "ash/public/interfaces/voice_interaction_controller.mojom.h"
#include "ash/public/mojom/voice_interaction_controller.mojom.h"
#include "ash/session/session_observer.h"
#include "ash/shell_observer.h"
#include "ash/wm/mru_window_tracker.h"

@ -9,7 +9,7 @@
#include "ash/assistant/model/assistant_alarm_timer_model.h"
#include "ash/assistant/model/assistant_alarm_timer_model_observer.h"
#include "ash/assistant/model/assistant_ui_model_observer.h"
#include "ash/public/interfaces/assistant_controller.mojom.h"
#include "ash/public/mojom/assistant_controller.mojom.h"
#include "base/macros.h"
#include "base/timer/timer.h"
#include "mojo/public/cpp/bindings/binding.h"

@ -9,7 +9,7 @@
#include "ash/assistant/model/assistant_cache_model.h"
#include "ash/assistant/model/assistant_ui_model_observer.h"
#include "ash/public/cpp/assistant/default_voice_interaction_observer.h"
#include "ash/public/interfaces/voice_interaction_controller.mojom.h"
#include "ash/public/mojom/voice_interaction_controller.mojom.h"
#include "base/macros.h"
namespace ash {

@ -25,9 +25,9 @@
#include "ash/assistant/ui/assistant_view_delegate.h"
#include "ash/public/cpp/assistant/assistant_image_downloader.h"
#include "ash/public/cpp/assistant/default_voice_interaction_observer.h"
#include "ash/public/interfaces/assistant_controller.mojom.h"
#include "ash/public/interfaces/assistant_volume_control.mojom.h"
#include "ash/public/interfaces/voice_interaction_controller.mojom.h"
#include "ash/public/mojom/assistant_controller.mojom.h"
#include "ash/public/mojom/assistant_volume_control.mojom.h"
#include "ash/public/mojom/voice_interaction_controller.mojom.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"

@ -13,7 +13,7 @@
#include "ash/assistant/model/assistant_notification_model.h"
#include "ash/assistant/model/assistant_notification_model_observer.h"
#include "ash/assistant/model/assistant_ui_model_observer.h"
#include "ash/public/interfaces/assistant_controller.mojom.h"
#include "ash/public/mojom/assistant_controller.mojom.h"
#include "base/macros.h"
#include "chromeos/services/assistant/public/mojom/assistant.mojom.h"
#include "mojo/public/cpp/bindings/binding.h"

@ -11,7 +11,7 @@
#include "ash/assistant/assistant_controller_observer.h"
#include "ash/assistant/model/assistant_screen_context_model.h"
#include "ash/assistant/model/assistant_ui_model_observer.h"
#include "ash/public/interfaces/assistant_controller.mojom.h"
#include "ash/public/mojom/assistant_controller.mojom.h"
#include "base/macros.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "ui/gfx/geometry/rect.h"

@ -9,7 +9,7 @@
#include "ash/assistant/util/deep_link_util.h"
#include "ash/assistant/util/i18n_util.h"
#include "ash/public/cpp/voice_interaction_controller.h"
#include "ash/public/interfaces/voice_interaction_controller.mojom.h"
#include "ash/public/mojom/voice_interaction_controller.mojom.h"
#include "ash/shell.h"
#include "base/bind.h"
#include "base/bind_helpers.h"

@ -10,7 +10,7 @@
#include <string>
#include "ash/ash_export.h"
#include "ash/public/interfaces/cros_display_config.mojom.h"
#include "ash/public/mojom/cros_display_config.mojom.h"
#include "base/macros.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/public/cpp/bindings/interface_ptr_set.h"

@ -6,7 +6,7 @@
#include "ash/display/cros_display_config.h"
#include "ash/display/touch_calibrator_controller.h"
#include "ash/public/interfaces/cros_display_config.mojom.h"
#include "ash/public/mojom/cros_display_config.mojom.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/touch/ash_touch_transform_controller.h"

@ -9,7 +9,7 @@
#include "ash/ash_export.h"
#include "ash/display/window_tree_host_manager.h"
#include "ash/public/interfaces/cros_display_config.mojom.h"
#include "ash/public/mojom/cros_display_config.mojom.h"
#include "base/callback.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"

@ -10,8 +10,8 @@
#include "ash/ash_export.h"
#include "ash/public/cpp/cast_config_controller.h"
#include "ash/public/interfaces/ime_controller.mojom.h"
#include "ash/public/interfaces/ime_info.mojom.h"
#include "ash/public/mojom/ime_controller.mojom.h"
#include "ash/public/mojom/ime_info.mojom.h"
#include "base/macros.h"
#include "base/observer_list.h"
#include "mojo/public/cpp/bindings/binding_set.h"

@ -8,7 +8,7 @@
#include "ash/ime/mode_indicator_observer.h"
#include "ash/ime/test_ime_controller_client.h"
#include "ash/public/interfaces/ime_info.mojom.h"
#include "ash/public/mojom/ime_info.mojom.h"
#include "ash/shell.h"
#include "ash/system/ime/ime_observer.h"
#include "ash/system/tray/system_tray_notifier.h"

@ -8,7 +8,7 @@
#include <string>
#include <utility>
#include "ash/public/interfaces/ime_controller.mojom.h"
#include "ash/public/mojom/ime_controller.mojom.h"
namespace ash {

@ -5,7 +5,7 @@
#ifndef ASH_IME_TEST_IME_CONTROLLER_CLIENT_H_
#define ASH_IME_TEST_IME_CONTROLLER_CLIENT_H_
#include "ash/public/interfaces/ime_controller.mojom.h"
#include "ash/public/mojom/ime_controller.mojom.h"
#include "base/macros.h"
#include "mojo/public/cpp/bindings/binding.h"

@ -7,7 +7,7 @@
#include <utility>
#include "ash/lock_screen_action/lock_screen_note_launcher.h"
#include "ash/public/interfaces/tray_action.mojom.h"
#include "ash/public/mojom/tray_action.mojom.h"
#include "ash/shell.h"
#include "ash/system/power/scoped_backlights_forced_off.h"
#include "ash/tray_action/tray_action.h"

@ -10,7 +10,7 @@
#include "ash/accessibility/test_accessibility_controller_client.h"
#include "ash/public/cpp/ash_switches.h"
#include "ash/public/interfaces/tray_action.mojom.h"
#include "ash/public/mojom/tray_action.mojom.h"
#include "ash/shell.h"
#include "ash/system/power/power_button_controller.h"
#include "ash/test/ash_test_base.h"

@ -4,7 +4,7 @@
#include "ash/lock_screen_action/lock_screen_note_launcher.h"
#include "ash/public/interfaces/tray_action.mojom.h"
#include "ash/public/mojom/tray_action.mojom.h"
#include "ash/shell.h"
#include "ash/tray_action/tray_action.h"
#include "base/bind.h"

@ -30,7 +30,7 @@
#include "ash/login/ui/views_utils.h"
#include "ash/public/cpp/ash_features.h"
#include "ash/public/cpp/ash_pref_names.h"
#include "ash/public/interfaces/tray_action.mojom.h"
#include "ash/public/mojom/tray_action.mojom.h"
#include "ash/root_window_controller.h"
#include "ash/session/session_controller_impl.h"
#include "ash/shell.h"

@ -12,7 +12,7 @@
#include "ash/ash_export.h"
#include "ash/detachable_base/detachable_base_pairing_status.h"
#include "ash/public/cpp/login_screen_model.h"
#include "ash/public/interfaces/tray_action.mojom.h"
#include "ash/public/mojom/tray_action.mojom.h"
#include "base/macros.h"
#include "base/observer_list.h"

@ -10,7 +10,7 @@
#include "ash/login/ui/lock_screen.h"
#include "ash/login/ui/login_test_utils.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/public/interfaces/tray_action.mojom.h"
#include "ash/public/mojom/tray_action.mojom.h"
#include "ash/session/test_session_controller_client.h"
#include "ash/shell.h"
#include "ash/wallpaper/wallpaper_controller_impl.h"

@ -6,7 +6,7 @@
#include <memory>
#include "ash/public/interfaces/tray_action.mojom.h"
#include "ash/public/mojom/tray_action.mojom.h"
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/shelf/shelf_constants.h"
#include "ash/strings/grit/ash_strings.h"

@ -9,7 +9,7 @@
#include "ash/login/ui/login_test_base.h"
#include "ash/login/ui/views_utils.h"
#include "ash/public/interfaces/tray_action.mojom.h"
#include "ash/public/mojom/tray_action.mojom.h"
#include "ash/shell.h"
#include "ash/tray_action/test_tray_action_client.h"
#include "base/macros.h"

@ -6,7 +6,7 @@
#include <utility>
#include "ash/public/interfaces/status_area_widget_test_api.test-mojom.h"
#include "ash/public/mojom/status_area_widget_test_api.test-mojom.h"
#include "ash/system/status_area_widget_test_api.h"
#include "base/bind.h"
#include "base/single_thread_task_runner.h"

@ -244,7 +244,7 @@ component("cpp") {
]
public_deps = [
"//ash/public/interfaces",
"//ash/public/mojom",
"//base",
"//components/arc/common:notifications",
"//components/session_manager:base",
@ -262,7 +262,7 @@ source_set("manifest") {
]
deps = [
"//ash/public/interfaces",
"//ash/public/mojom",
"//base",
"//chromeos/services/multidevice_setup/public/mojom",
"//chromeos/services/network_config/public/mojom",
@ -286,7 +286,7 @@ source_set("manifest_for_tests") {
deps = [
":manifest",
"//ash/public/interfaces:test_interfaces",
"//ash/public/mojom:test_interfaces",
"//base",
"//services/service_manager/public/cpp",
"//services/service_manager/public/mojom",

@ -8,7 +8,5 @@ per-file *shelf*=file://ash/shelf/OWNERS
per-file *.mojom=set noparent
per-file *.mojom=file://ipc/SECURITY_OWNERS
per-file *_struct_traits*.*=set noparent
per-file *_struct_traits*.*=file://ipc/SECURITY_OWNERS
per-file *_mojom_traits*.*=set noparent
per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS

@ -1,6 +1,6 @@
xiyuan@chromium.org
per-file *_struct_traits*.*=set noparent
per-file *_struct_traits*.*=file://ipc/SECURITY_OWNERS
per-file *_mojom_traits*.*=set noparent
per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
# COMPONENT: UI>Shell>Launcher

@ -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 "ash/public/cpp/app_list/app_list_struct_traits.h"
#include "ash/public/cpp/app_list/app_list_mojom_traits.h"
#include "mojo/public/cpp/base/string16_mojom_traits.h"
#include "ui/gfx/image/mojom/image_skia_mojom_traits.h"

@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef ASH_PUBLIC_CPP_APP_LIST_APP_LIST_STRUCT_TRAITS_H_
#define ASH_PUBLIC_CPP_APP_LIST_APP_LIST_STRUCT_TRAITS_H_
#ifndef ASH_PUBLIC_CPP_APP_LIST_APP_LIST_MOJOM_TRAITS_H_
#define ASH_PUBLIC_CPP_APP_LIST_APP_LIST_MOJOM_TRAITS_H_
#include "ash/public/cpp/app_list/app_list_types.h"
#include "ash/public/cpp/ash_public_export.h"
#include "ash/public/interfaces/app_list.mojom-shared.h"
#include "ash/public/mojom/app_list.mojom-shared.h"
#include "base/containers/span.h"
#include "base/strings/string16.h"
#include "mojo/public/mojom/base/string16.mojom.h"
@ -244,4 +244,4 @@ struct StructTraits<ash::mojom::SearchResultActionDataView,
} // namespace mojo
#endif // ASH_PUBLIC_CPP_APP_LIST_APP_LIST_STRUCT_TRAITS_H_
#endif // ASH_PUBLIC_CPP_APP_LIST_APP_LIST_MOJOM_TRAITS_H_

@ -7,7 +7,7 @@
#include <string>
#include "ash/public/interfaces/voice_interaction_controller.mojom.h"
#include "ash/public/mojom/voice_interaction_controller.mojom.h"
#include "base/macros.h"
#include "base/optional.h"

@ -6,7 +6,7 @@
#include <utility>
#include "ash/public/cpp/assistant/assistant_state_proxy.h"
#include "ash/public/interfaces/constants.mojom.h"
#include "ash/public/mojom/constants.mojom.h"
#include "services/service_manager/public/cpp/connector.h"
namespace ash {

@ -10,7 +10,7 @@
#include "ash/public/cpp/assistant/assistant_state_base.h"
#include "ash/public/cpp/assistant/default_voice_interaction_observer.h"
#include "ash/public/interfaces/voice_interaction_controller.mojom.h"
#include "ash/public/mojom/voice_interaction_controller.mojom.h"
#include "base/callback.h"
#include "base/macros.h"
#include "base/observer_list.h"

@ -7,7 +7,7 @@
#include <string>
#include "ash/public/interfaces/voice_interaction_controller.mojom.h"
#include "ash/public/mojom/voice_interaction_controller.mojom.h"
#include "base/macros.h"
#include "base/observer_list_types.h"

@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "ash/public/cpp/default_scale_factor_retriever.h"
#include "ash/public/interfaces/constants.mojom.h"
#include "ash/public/mojom/constants.mojom.h"
#include "base/bind.h"
namespace ash {

@ -6,7 +6,7 @@
#define ASH_PUBLIC_CPP_DEFAULT_SCALE_FACTOR_RETRIEVER_H_
#include "ash/public/cpp/ash_public_export.h"
#include "ash/public/interfaces/cros_display_config.mojom.h"
#include "ash/public/mojom/cros_display_config.mojom.h"
#include "base/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"

@ -4,7 +4,7 @@
#include "ash/public/cpp/default_scale_factor_retriever.h"
#include "ash/public/interfaces/cros_display_config.mojom.h"
#include "ash/public/mojom/cros_display_config.mojom.h"
#include "base/bind.h"
#include "base/run_loop.h"
#include "base/test/scoped_task_environment.h"

@ -4,14 +4,14 @@
#include "ash/public/cpp/manifest.h"
#include "ash/public/interfaces/assistant_controller.mojom.h"
#include "ash/public/interfaces/assistant_volume_control.mojom.h"
#include "ash/public/interfaces/constants.mojom.h"
#include "ash/public/interfaces/cros_display_config.mojom.h"
#include "ash/public/interfaces/ime_controller.mojom.h"
#include "ash/public/interfaces/tray_action.mojom.h"
#include "ash/public/interfaces/voice_interaction_controller.mojom.h"
#include "ash/public/interfaces/vpn_list.mojom.h"
#include "ash/public/mojom/assistant_controller.mojom.h"
#include "ash/public/mojom/assistant_volume_control.mojom.h"
#include "ash/public/mojom/constants.mojom.h"
#include "ash/public/mojom/cros_display_config.mojom.h"
#include "ash/public/mojom/ime_controller.mojom.h"
#include "ash/public/mojom/tray_action.mojom.h"
#include "ash/public/mojom/voice_interaction_controller.mojom.h"
#include "ash/public/mojom/vpn_list.mojom.h"
#include "base/no_destructor.h"
#include "chromeos/services/multidevice_setup/public/mojom/constants.mojom.h"
#include "chromeos/services/network_config/public/mojom/constants.mojom.h"

@ -4,7 +4,7 @@
#include "ash/public/cpp/test_manifest.h"
#include "ash/public/interfaces/status_area_widget_test_api.test-mojom.h"
#include "ash/public/mojom/status_area_widget_test_api.test-mojom.h"
#include "base/no_destructor.h"
#include "services/service_manager/public/cpp/manifest_builder.h"

@ -10,7 +10,7 @@
#include "ash/public/cpp/ash_public_export.h"
#include "ash/public/cpp/assistant/assistant_state_base.h"
#include "ash/public/cpp/assistant/default_voice_interaction_observer.h"
#include "ash/public/interfaces/voice_interaction_controller.mojom.h"
#include "ash/public/mojom/voice_interaction_controller.mojom.h"
#include "base/observer_list.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/public/cpp/bindings/interface_ptr_set.h"

@ -7,7 +7,7 @@
#include <memory>
#include <utility>
#include "ash/public/interfaces/voice_interaction_controller.mojom.h"
#include "ash/public/mojom/voice_interaction_controller.mojom.h"
#include "base/test/scoped_task_environment.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "testing/gtest/include/gtest/gtest.h"

@ -4,7 +4,7 @@
import("//mojo/public/tools/bindings/mojom.gni")
mojom("interfaces") {
mojom("mojom") {
disable_variants = true
sources = [
@ -49,7 +49,7 @@ mojom("test_interfaces") {
"status_area_widget_test_api.test-mojom",
]
deps = [
":interfaces",
":mojom",
"//components/account_id/mojom",
"//mojo/public/mojom/base",
"//ui/gfx/geometry/mojom",

@ -1,6 +1,6 @@
per-file *.mojom=set noparent
per-file *.mojom=file://ipc/SECURITY_OWNERS
per-file *_struct_traits*.*=set noparent
per-file *_struct_traits*.*=file://ipc/SECURITY_OWNERS
per-file *_mojom_traits*.*=set noparent
per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
per-file *.typemap=set noparent
per-file *.typemap=file://ipc/SECURITY_OWNERS

@ -4,7 +4,7 @@
module ash.mojom;
import "ash/public/interfaces/ime_info.mojom";
import "ash/public/mojom/ime_info.mojom";
import "mojo/public/mojom/base/string16.mojom";
import "ui/base/ime/chromeos/public/mojom/ime_keyset.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";

@ -10,7 +10,7 @@
#include "ash/app_list/app_list_controller_observer.h"
#include "ash/public/cpp/assistant/default_voice_interaction_observer.h"
#include "ash/public/cpp/tablet_mode_observer.h"
#include "ash/public/interfaces/voice_interaction_controller.mojom.h"
#include "ash/public/mojom/voice_interaction_controller.mojom.h"
#include "ash/session/session_observer.h"
#include "base/macros.h"

@ -8,7 +8,7 @@
#include <utility>
#include "ash/public/cpp/window_properties.h"
#include "ash/public/interfaces/constants.mojom.h"
#include "ash/public/mojom/constants.mojom.h"
#include "ash/shell.h"
#include "ash/shell/content/client/shell_browser_main_parts.h"
#include "base/base_switches.h"

@ -10,7 +10,7 @@
#include "ash/app_list/app_list_controller_impl.h"
#include "ash/app_list/model/app_list_item.h"
#include "ash/app_list/model/search/search_result.h"
#include "ash/public/interfaces/constants.mojom.h"
#include "ash/public/mojom/constants.mojom.h"
#include "ash/session/session_controller_impl.h"
#include "ash/shell.h"
#include "ash/shell/example_factory.h"

@ -7,7 +7,7 @@
#include <stddef.h>
#include "ash/public/interfaces/ime_info.mojom.h"
#include "ash/public/mojom/ime_info.mojom.h"
#include "ash/system/ime_menu/ime_list_view.h"
#include "base/macros.h"

@ -9,7 +9,7 @@
#include "ash/keyboard/keyboard_controller_impl.h"
#include "ash/keyboard/ui/keyboard_util.h"
#include "ash/keyboard/virtual_keyboard_controller.h"
#include "ash/public/interfaces/ime_info.mojom.h"
#include "ash/public/mojom/ime_info.mojom.h"
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h"

@ -7,8 +7,8 @@
#include "ash/ash_export.h"
#include "ash/public/cpp/keyboard/keyboard_controller_observer.h"
#include "ash/public/interfaces/ime_controller.mojom.h"
#include "ash/public/interfaces/ime_info.mojom.h"
#include "ash/public/mojom/ime_controller.mojom.h"
#include "ash/public/mojom/ime_info.mojom.h"
#include "ash/system/ime/ime_observer.h"
#include "ash/system/tray/tray_background_view.h"
#include "ash/system/tray/tray_bubble_view.h"

@ -7,7 +7,7 @@
#include "ash/accelerators/accelerator_controller_impl.h"
#include "ash/ime/ime_controller.h"
#include "ash/ime/test_ime_controller_client.h"
#include "ash/public/interfaces/ime_info.mojom.h"
#include "ash/public/mojom/ime_info.mojom.h"
#include "ash/shell.h"
#include "ash/system/ime_menu/ime_list_view.h"
#include "ash/system/status_area_widget.h"

@ -6,7 +6,7 @@
#include <memory>
#include "ash/public/interfaces/vpn_list.mojom.h"
#include "ash/public/mojom/vpn_list.mojom.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "base/macros.h"

@ -9,7 +9,7 @@
#include <vector>
#include "ash/ash_export.h"
#include "ash/public/interfaces/vpn_list.mojom.h"
#include "ash/public/mojom/vpn_list.mojom.h"
#include "base/macros.h"
#include "base/observer_list.h"
#include "base/time/time.h"

@ -7,7 +7,7 @@
#include <algorithm>
#include <vector>
#include "ash/public/interfaces/vpn_list.mojom.h"
#include "ash/public/mojom/vpn_list.mojom.h"
#include "base/macros.h"
#include "testing/gtest/include/gtest/gtest.h"

@ -15,7 +15,7 @@
#include "ash/public/cpp/ash_switches.h"
#include "ash/public/cpp/stylus_utils.h"
#include "ash/public/cpp/voice_interaction_controller.h"
#include "ash/public/interfaces/voice_interaction_controller.mojom.h"
#include "ash/public/mojom/voice_interaction_controller.mojom.h"
#include "ash/root_window_controller.h"
#include "ash/session/session_controller_impl.h"
#include "ash/session/test_session_controller_client.h"

@ -8,7 +8,7 @@
#include "ash/ash_export.h"
#include "ash/highlighter/highlighter_controller.h"
#include "ash/public/cpp/assistant/default_voice_interaction_observer.h"
#include "ash/public/interfaces/voice_interaction_controller.mojom.h"
#include "ash/public/mojom/voice_interaction_controller.mojom.h"
#include "ash/system/palette/common_palette_tool.h"
#include "base/memory/weak_ptr.h"
#include "ui/events/event_handler.h"

@ -7,7 +7,7 @@
#include "ash/highlighter/highlighter_controller.h"
#include "ash/highlighter/highlighter_controller_test_api.h"
#include "ash/public/cpp/voice_interaction_controller.h"
#include "ash/public/interfaces/voice_interaction_controller.mojom.h"
#include "ash/public/mojom/voice_interaction_controller.mojom.h"
#include "ash/shell.h"
#include "ash/system/palette/mock_palette_tool_delegate.h"
#include "ash/system/palette/palette_ids.h"

@ -7,7 +7,7 @@
#include <memory>
#include "ash/public/interfaces/status_area_widget_test_api.test-mojom.h"
#include "ash/public/mojom/status_area_widget_test_api.test-mojom.h"
#include "ash/system/status_area_widget.h"
#include "base/macros.h"

@ -7,7 +7,7 @@
#include <vector>
#include "ash/public/interfaces/tray_action.mojom.h"
#include "ash/public/mojom/tray_action.mojom.h"
#include "base/macros.h"
#include "mojo/public/cpp/bindings/binding.h"

@ -8,7 +8,7 @@
#include <memory>
#include "ash/ash_export.h"
#include "ash/public/interfaces/tray_action.mojom.h"
#include "ash/public/mojom/tray_action.mojom.h"
#include "base/macros.h"
#include "base/observer_list.h"
#include "base/scoped_observer.h"

@ -6,7 +6,7 @@
#define ASH_TRAY_ACTION_TRAY_ACTION_OBSERVER_H_
#include "ash/ash_export.h"
#include "ash/public/interfaces/tray_action.mojom.h"
#include "ash/public/mojom/tray_action.mojom.h"
namespace ash {

@ -9,7 +9,7 @@
#include "ash/lock_screen_action/lock_screen_action_background_controller.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/public/interfaces/tray_action.mojom.h"
#include "ash/public/mojom/tray_action.mojom.h"
#include "ash/shell.h"
#include "ash/tray_action/tray_action.h"
#include "ash/wm/lock_window_state.h"

@ -17,7 +17,7 @@
#include "ash/lock_screen_action/test_lock_screen_action_background_controller.h"
#include "ash/public/cpp/keyboard/keyboard_switches.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/public/interfaces/tray_action.mojom.h"
#include "ash/public/mojom/tray_action.mojom.h"
#include "ash/root_window_controller.h"
#include "ash/screen_util.h"
#include "ash/session/test_session_controller_client.h"

@ -330,7 +330,7 @@ include_rules = [
"+third_party/widevine/cdm/widevine_cdm_common.h",
# Code under //ash runs out-of-process in mash so it must be accessed via mojo
# interfaces in //ash/public/interfaces. See //ash/README.md.
# interfaces in //ash/public/mojom. See //ash/README.md.
"-ash",
"+ash/public",
"+ash/keyboard/ui/public",

@ -45,7 +45,7 @@
#include "ash/public/cpp/accessibility_focus_ring_info.h"
#include "ash/public/cpp/event_rewriter_controller.h"
#include "ash/public/cpp/window_tree_host_lookup.h"
#include "ash/public/interfaces/constants.mojom.h"
#include "ash/public/mojom/constants.mojom.h"
#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
#include "chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.h"
#include "ui/aura/window_tree_host.h"

@ -5,7 +5,7 @@
#include "chrome/browser/ash_service_registry.h"
#include "ash/ash_service.h"
#include "ash/public/interfaces/constants.mojom.h"
#include "ash/public/mojom/constants.mojom.h"
#include "content/public/common/service_manager_connection.h"
namespace ash_service_registry {

@ -6,7 +6,7 @@
#include <utility>
#include "ash/public/interfaces/constants.mojom.h"
#include "ash/public/mojom/constants.mojom.h"
#include "base/bind.h"
#include "base/logging.h"
#include "base/memory/singleton.h"

@ -384,7 +384,7 @@
#include "services/audio/public/mojom/constants.mojom.h"
#elif defined(OS_CHROMEOS)
#include "ash/public/cpp/tablet_mode.h"
#include "ash/public/interfaces/constants.mojom.h"
#include "ash/public/mojom/constants.mojom.h"
#include "chrome/browser/ash_service_registry.h"
#include "chrome/browser/chromeos/arc/fileapi/arc_content_file_system_backend_delegate.h"
#include "chrome/browser/chromeos/arc/fileapi/arc_documents_provider_backend_delegate.h"

@ -17,7 +17,7 @@
#include "ash/public/cpp/accessibility_focus_ring_controller.h"
#include "ash/public/cpp/accessibility_focus_ring_info.h"
#include "ash/public/cpp/ash_pref_names.h"
#include "ash/public/interfaces/constants.mojom.h"
#include "ash/public/mojom/constants.mojom.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
#include "ash/sticky_keys/sticky_keys_controller.h"

@ -8,9 +8,9 @@
#include "ash/accessibility/accessibility_focus_ring_controller_impl.h"
#include "ash/accessibility/accessibility_focus_ring_layer.h"
#include "ash/public/cpp/ash_features.h"
#include "ash/public/interfaces/constants.mojom.h"
#include "ash/public/interfaces/status_area_widget_test_api.test-mojom-test-utils.h"
#include "ash/public/interfaces/status_area_widget_test_api.test-mojom.h"
#include "ash/public/mojom/constants.mojom.h"
#include "ash/public/mojom/status_area_widget_test_api.test-mojom-test-utils.h"
#include "ash/public/mojom/status_area_widget_test_api.test-mojom.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
#include "ash/system/status_area_widget.h"

@ -7,7 +7,7 @@
#include <utility>
#include "ash/public/cpp/default_scale_factor_retriever.h"
#include "ash/public/interfaces/constants.mojom.h"
#include "ash/public/mojom/constants.mojom.h"
#include "base/bind.h"
#include "base/logging.h"
#include "base/task/post_task.h"

@ -7,7 +7,7 @@
#include <memory>
#include "ash/public/interfaces/voice_interaction_controller.mojom.h"
#include "ash/public/mojom/voice_interaction_controller.mojom.h"
#include "chrome/browser/chromeos/arc/arc_session_manager.h"
#include "components/prefs/pref_change_registrar.h"
#include "components/user_manager/user_manager.h"

@ -6,7 +6,7 @@
#include <string>
#include "ash/public/interfaces/voice_interaction_controller.mojom-shared.h"
#include "ash/public/mojom/voice_interaction_controller.mojom-shared.h"
#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/profiles/profile.h"

@ -5,7 +5,7 @@
#ifndef CHROME_BROWSER_CHROMEOS_ASSISTANT_ASSISTANT_UTIL_H_
#define CHROME_BROWSER_CHROMEOS_ASSISTANT_ASSISTANT_UTIL_H_
#include "ash/public/interfaces/voice_interaction_controller.mojom.h"
#include "ash/public/mojom/voice_interaction_controller.mojom.h"
class Profile;

@ -14,7 +14,7 @@
#include "ash/public/cpp/shelf_prefs.h"
#include "ash/public/cpp/tablet_mode.h"
#include "ash/public/cpp/window_properties.h"
#include "ash/public/interfaces/constants.mojom.h"
#include "ash/public/mojom/constants.mojom.h"
#include "ash/shell.h"
#include "ash/wm/wm_event.h"
#include "base/base64.h"

@ -4,7 +4,7 @@
#include "apps/launcher.h"
#include "ash/public/cpp/ash_switches.h"
#include "ash/public/interfaces/tray_action.mojom.h"
#include "ash/public/mojom/tray_action.mojom.h"
#include "base/command_line.h"
#include "base/run_loop.h"
#include "base/scoped_observer.h"

@ -7,7 +7,7 @@
#include <utility>
#include "ash/public/cpp/stylus_utils.h"
#include "ash/public/interfaces/constants.mojom.h"
#include "ash/public/mojom/constants.mojom.h"
#include "base/base64.h"
#include "base/bind.h"
#include "base/command_line.h"

@ -8,7 +8,7 @@
#include <memory>
#include <string>
#include "ash/public/interfaces/tray_action.mojom.h"
#include "ash/public/mojom/tray_action.mojom.h"
#include "base/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"

@ -10,7 +10,7 @@
#include <vector>
#include "ash/public/cpp/ash_switches.h"
#include "ash/public/interfaces/tray_action.mojom.h"
#include "ash/public/mojom/tray_action.mojom.h"
#include "ash/session/test_session_controller_client.h"
#include "base/base64.h"
#include "base/bind.h"

@ -5,7 +5,7 @@
#ifndef CHROME_BROWSER_CHROMEOS_LOCK_SCREEN_APPS_STATE_OBSERVER_H_
#define CHROME_BROWSER_CHROMEOS_LOCK_SCREEN_APPS_STATE_OBSERVER_H_
#include "ash/public/interfaces/tray_action.mojom.h"
#include "ash/public/mojom/tray_action.mojom.h"
namespace lock_screen_apps {

@ -8,7 +8,7 @@
#include "ash/public/cpp/login_screen.h"
#include "ash/public/cpp/login_screen_model.h"
#include "ash/public/cpp/login_types.h"
#include "ash/public/interfaces/constants.mojom.h"
#include "ash/public/mojom/constants.mojom.h"
#include "base/bind.h"
#include "base/command_line.h"
#include "base/lazy_instance.h"

@ -4,8 +4,8 @@
#include "chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps_fetcher_impl.h"
#include "ash/public/interfaces/constants.mojom.h"
#include "ash/public/interfaces/cros_display_config.mojom.h"
#include "ash/public/mojom/constants.mojom.h"
#include "ash/public/mojom/cros_display_config.mojom.h"
#include "base/base64url.h"
#include "base/bind.h"
#include "base/json/json_reader.h"

@ -9,7 +9,7 @@
#include <string>
#include <vector>
#include "ash/public/interfaces/cros_display_config.mojom.h"
#include "ash/public/mojom/cros_display_config.mojom.h"
#include "base/callback.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"

@ -7,8 +7,8 @@
#include <memory>
#include <vector>
#include "ash/public/interfaces/constants.mojom.h"
#include "ash/public/interfaces/cros_display_config.mojom.h"
#include "ash/public/mojom/constants.mojom.h"
#include "ash/public/mojom/cros_display_config.mojom.h"
#include "base/base64url.h"
#include "base/files/file_path.h"
#include "base/run_loop.h"

@ -10,7 +10,7 @@
#include <string>
#include <vector>
#include "ash/public/interfaces/cros_display_config.mojom.h"
#include "ash/public/mojom/cros_display_config.mojom.h"
#include "chrome/browser/chromeos/policy/display_settings_handler.h"
namespace policy {

@ -10,7 +10,7 @@
#include <string>
#include <vector>
#include "ash/public/interfaces/cros_display_config.mojom.h"
#include "ash/public/mojom/cros_display_config.mojom.h"
#include "chrome/browser/chromeos/policy/display_settings_handler.h"
#include "ui/display/display.h"

@ -5,7 +5,7 @@
#include "chrome/browser/chromeos/policy/display_settings_handler.h"
#include <utility>
#include "ash/public/interfaces/constants.mojom.h"
#include "ash/public/mojom/constants.mojom.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/location.h"

@ -8,7 +8,7 @@
#include <memory>
#include <vector>
#include "ash/public/interfaces/cros_display_config.mojom.h"
#include "ash/public/mojom/cros_display_config.mojom.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"

@ -10,8 +10,8 @@
#include "ash/public/cpp/ash_constants.h"
#include "ash/public/cpp/ash_pref_names.h"
#include "ash/public/cpp/ash_prefs.h"
#include "ash/public/interfaces/constants.mojom.h"
#include "ash/public/interfaces/cros_display_config.mojom.h"
#include "ash/public/mojom/constants.mojom.h"
#include "ash/public/mojom/cros_display_config.mojom.h"
#include "base/bind.h"
#include "base/command_line.h"
#include "base/i18n/time_formatting.h"

@ -7,7 +7,7 @@
#include <string>
#include "ash/public/interfaces/cros_display_config.mojom.h"
#include "ash/public/mojom/cros_display_config.mojom.h"
#include "base/macros.h"
#include "chrome/browser/chromeos/language_preferences.h"
#include "components/prefs/pref_change_registrar.h"

@ -8,8 +8,8 @@
#include <cmath>
#include "ash/public/cpp/tablet_mode.h"
#include "ash/public/interfaces/constants.mojom.h"
#include "ash/public/interfaces/cros_display_config.mojom.h"
#include "ash/public/mojom/constants.mojom.h"
#include "ash/public/mojom/cros_display_config.mojom.h"
#include "base/bind.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"

Some files were not shown because too many files have changed in this diff Show More