Move //chrome/browser/{chromeos => ash}/crosapi
This CL is part of the Chrome OS source code directory migration: https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE. Change-Id: I6850825a10e423b776231befeda96d595409af8a Bug: 1164001 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2728956 Reviewed-by: Hidehiko Abe <hidehiko@chromium.org> Owners-Override: Hidehiko Abe <hidehiko@chromium.org> Commit-Queue: Yeunjoo Choi <ychoi@igalia.com> Cr-Commit-Position: refs/heads/master@{#860628}
This commit is contained in:
Yeunjoo Choi
committed by
Chromium LUCI CQ
Chromium LUCI CQ
parent
8cd8e2f26f
commit
9d05622ef5
build/lacros
chrome
browser
about_flags.cc
apps
app_service
ash
crosapi
DEPSOWNERSREADME.mdbrowser_loader.ccbrowser_loader.hbrowser_loader_unittest.ccbrowser_manager.ccbrowser_manager.hbrowser_manager_observer.hbrowser_service_host_ash.ccbrowser_service_host_ash.hbrowser_service_host_observer.hbrowser_util.ccbrowser_util.hbrowser_util_unittest.cccert_database_ash.cccert_database_ash.hclipboard_ash.ccclipboard_ash.hcrosapi_ash.cccrosapi_ash.hcrosapi_id.hcrosapi_manager.cccrosapi_manager.hdevice_attributes_ash.ccdevice_attributes_ash.henvironment_provider.ccenvironment_provider.hfake_browser_manager.ccfake_browser_manager.hfeedback_ash.ccfeedback_ash.hfile_manager_ash.ccfile_manager_ash.hkeystore_service_ash.cckeystore_service_ash.hmessage_center_ash.ccmessage_center_ash.hmessage_center_ash_unittest.ccmetrics_reporting_ash.ccmetrics_reporting_ash.hmetrics_reporting_ash_unittest.ccprefs_ash.ccprefs_ash.hprefs_ash_unittest.ccscreen_manager_ash.ccscreen_manager_ash.hscreen_manager_ash_browsertest.ccselect_file_ash.ccselect_file_ash.htest_controller_ash.cctest_controller_ash.htest_mojo_connection_manager.cctest_mojo_connection_manager.htest_mojo_connection_manager_unittest.ccurl_handler_ash.ccurl_handler_ash.hwindow_util.ccwindow_util.h
system_logs
chromeos
component_updater
extensions
api
feedback_private
feedback
show_feedback_page.cc
system_logs
ui
test
content/public/test
docs
@ -287,7 +287,7 @@ def _RunTestWithAshChrome(args, forward_args):
|
||||
tmp_ash_data_dir_name = tempfile.mkdtemp()
|
||||
|
||||
# Please refer to below file for how mojo connection is set up in testing.
|
||||
# //chrome/browser/chromeos/crosapi/test_mojo_connection_manager.h
|
||||
# //chrome/browser/ash/crosapi/test_mojo_connection_manager.h
|
||||
lacros_mojo_socket_file = '%s/lacros.sock' % tmp_ash_data_dir_name
|
||||
lacros_mojo_socket_arg = ('--lacros-mojo-socket-for-testing=%s' %
|
||||
lacros_mojo_socket_file)
|
||||
|
||||
@ -213,7 +213,7 @@
|
||||
#include "ash/constants/ash_features.h"
|
||||
#include "ash/constants/ash_switches.h"
|
||||
#include "ash/public/cpp/ash_switches.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_util.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_util.h"
|
||||
#include "chrome/browser/nearby_sharing/common/nearby_share_features.h"
|
||||
#include "chromeos/services/assistant/public/cpp/features.h"
|
||||
#include "components/arc/arc_features.h"
|
||||
|
||||
@ -33,9 +33,9 @@
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
#include "chrome/browser/apps/app_service/lacros_apps.h"
|
||||
#include "chrome/browser/apps/app_service/uninstall_dialog.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_util.h"
|
||||
#include "chrome/browser/ash/profiles/profile_helper.h"
|
||||
#include "chrome/browser/chromeos/child_accounts/time_limits/app_time_limit_interface.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_util.h"
|
||||
#include "chrome/browser/supervised_user/grit/supervised_user_unscaled_resources.h"
|
||||
#include "components/services/app_service/public/cpp/app_capability_access_cache_wrapper.h"
|
||||
#include "components/services/app_service/public/cpp/app_registry_cache_wrapper.h"
|
||||
|
||||
@ -11,8 +11,8 @@
|
||||
#include "build/branding_buildflags.h"
|
||||
#include "chrome/browser/apps/app_service/app_icon_factory.h"
|
||||
#include "chrome/browser/apps/app_service/menu_util.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_util.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_util.h"
|
||||
#include "chrome/grit/chrome_unscaled_resources.h"
|
||||
#include "chrome/grit/generated_resources.h"
|
||||
#include "components/services/app_service/public/mojom/types.mojom.h"
|
||||
|
||||
@ -3,7 +3,7 @@ specific_include_rules = {
|
||||
# Provides a mojo interface around the message center, but lives in this
|
||||
# directory for consistency with other crosapi classes.
|
||||
"-chrome",
|
||||
"+chrome/browser/chromeos/crosapi",
|
||||
"+chrome/browser/ash/crosapi",
|
||||
"+ui/message_center/message_center.h",
|
||||
],
|
||||
"screen_manager_ash\.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/crosapi/browser_loader.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_loader.h"
|
||||
|
||||
#include <utility>
|
||||
|
||||
@ -15,8 +15,8 @@
|
||||
#include "base/logging.h"
|
||||
#include "base/task/task_traits.h"
|
||||
#include "base/task/thread_pool.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_util.h"
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_util.h"
|
||||
#include "chrome/browser/ui/ash/system_tray_client.h"
|
||||
#include "chromeos/cryptohome/system_salt_getter.h"
|
||||
#include "components/component_updater/component_updater_service.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_CHROMEOS_CROSAPI_BROWSER_LOADER_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_BROWSER_LOADER_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_BROWSER_LOADER_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_BROWSER_LOADER_H_
|
||||
|
||||
#include "base/callback.h"
|
||||
#include "base/files/file_path.h"
|
||||
@ -79,4 +79,4 @@ class BrowserLoader
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_BROWSER_LOADER_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_BROWSER_LOADER_H_
|
||||
@ -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 "chrome/browser/chromeos/crosapi/browser_loader.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_loader.h"
|
||||
|
||||
#include "base/run_loop.h"
|
||||
#include "base/test/bind.h"
|
||||
#include "base/test/scoped_feature_list.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_util.h"
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_util.h"
|
||||
#include "chrome/browser/component_updater/fake_cros_component_manager.h"
|
||||
#include "chrome/test/base/browser_process_platform_part_test_api_chromeos.h"
|
||||
#include "components/update_client/update_client.h"
|
||||
16
chrome/browser/chromeos/crosapi/browser_manager.cc → chrome/browser/ash/crosapi/browser_manager.cc
16
chrome/browser/chromeos/crosapi/browser_manager.cc → chrome/browser/ash/crosapi/browser_manager.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/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_manager.h"
|
||||
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
@ -31,14 +31,14 @@
|
||||
#include "base/system/sys_info.h"
|
||||
#include "base/task/task_traits.h"
|
||||
#include "base/task/thread_pool.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_loader.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_service_host_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_util.h"
|
||||
#include "chrome/browser/ash/crosapi/crosapi_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/crosapi_manager.h"
|
||||
#include "chrome/browser/ash/crosapi/environment_provider.h"
|
||||
#include "chrome/browser/ash/crosapi/test_mojo_connection_manager.h"
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_loader.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_service_host_ash.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_util.h"
|
||||
#include "chrome/browser/chromeos/crosapi/crosapi_ash.h"
|
||||
#include "chrome/browser/chromeos/crosapi/crosapi_manager.h"
|
||||
#include "chrome/browser/chromeos/crosapi/environment_provider.h"
|
||||
#include "chrome/browser/chromeos/crosapi/test_mojo_connection_manager.h"
|
||||
#include "chrome/browser/component_updater/cros_component_manager.h"
|
||||
#include "chrome/browser/profiles/profile_manager.h"
|
||||
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.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_CHROMEOS_CROSAPI_BROWSER_MANAGER_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_BROWSER_MANAGER_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_BROWSER_MANAGER_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_BROWSER_MANAGER_H_
|
||||
|
||||
#include <memory>
|
||||
|
||||
@ -15,10 +15,10 @@
|
||||
#include "base/optional.h"
|
||||
#include "base/process/process.h"
|
||||
#include "base/time/time.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_manager_observer.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_service_host_observer.h"
|
||||
#include "chrome/browser/chromeos/crosapi/crosapi_id.h"
|
||||
#include "chrome/browser/chromeos/crosapi/environment_provider.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_manager_observer.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_service_host_observer.h"
|
||||
#include "chrome/browser/ash/crosapi/crosapi_id.h"
|
||||
#include "chrome/browser/ash/crosapi/environment_provider.h"
|
||||
#include "chromeos/crosapi/mojom/crosapi.mojom.h"
|
||||
#include "components/session_manager/core/session_manager_observer.h"
|
||||
#include "mojo/public/cpp/bindings/remote.h"
|
||||
@ -248,4 +248,4 @@ class BrowserManager : public session_manager::SessionManagerObserver,
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_BROWSER_MANAGER_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_BROWSER_MANAGER_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_CHROMEOS_CROSAPI_BROWSER_MANAGER_OBSERVER_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_BROWSER_MANAGER_OBSERVER_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_BROWSER_MANAGER_OBSERVER_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_BROWSER_MANAGER_OBSERVER_H_
|
||||
|
||||
#include "base/observer_list_types.h"
|
||||
|
||||
@ -17,4 +17,4 @@ class BrowserManagerObserver : public base::CheckedObserver {
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_BROWSER_MANAGER_OBSERVER_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_BROWSER_MANAGER_OBSERVER_H_
|
||||
@ -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 "chrome/browser/chromeos/crosapi/browser_service_host_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_service_host_ash.h"
|
||||
|
||||
#include <utility>
|
||||
|
||||
#include "base/bind.h"
|
||||
#include "base/check.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_service_host_observer.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_service_host_observer.h"
|
||||
#include "chromeos/crosapi/mojom/crosapi.mojom.h"
|
||||
|
||||
namespace crosapi {
|
||||
@ -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 CHROME_BROWSER_CHROMEOS_CROSAPI_BROWSER_SERVICE_HOST_ASH_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_BROWSER_SERVICE_HOST_ASH_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_BROWSER_SERVICE_HOST_ASH_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_BROWSER_SERVICE_HOST_ASH_H_
|
||||
|
||||
#include <set>
|
||||
|
||||
#include "base/memory/weak_ptr.h"
|
||||
#include "base/observer_list.h"
|
||||
#include "chrome/browser/chromeos/crosapi/crosapi_id.h"
|
||||
#include "chrome/browser/ash/crosapi/crosapi_id.h"
|
||||
#include "chromeos/crosapi/mojom/crosapi.mojom.h"
|
||||
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
||||
#include "mojo/public/cpp/bindings/pending_remote.h"
|
||||
@ -67,4 +67,4 @@ class BrowserServiceHostAsh : public mojom::BrowserServiceHost {
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_BROWSER_SERVICE_HOST_ASH_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_BROWSER_SERVICE_HOST_ASH_H_
|
||||
@ -2,11 +2,11 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#ifndef CHROME_BROWSER_CHROMEOS_CROSAPI_BROWSER_SERVICE_HOST_OBSERVER_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_BROWSER_SERVICE_HOST_OBSERVER_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_BROWSER_SERVICE_HOST_OBSERVER_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_BROWSER_SERVICE_HOST_OBSERVER_H_
|
||||
|
||||
#include "base/observer_list_types.h"
|
||||
#include "chrome/browser/chromeos/crosapi/crosapi_id.h"
|
||||
#include "chrome/browser/ash/crosapi/crosapi_id.h"
|
||||
#include "mojo/public/cpp/bindings/remote_set.h"
|
||||
|
||||
namespace crosapi {
|
||||
@ -33,4 +33,4 @@ class BrowserServiceHostObserver : public base::CheckedObserver {
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_BROWSER_SERVICE_HOST_OBSERVER_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_BROWSER_SERVICE_HOST_OBSERVER_H_
|
||||
@ -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/crosapi/browser_util.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_util.h"
|
||||
|
||||
#include <sys/mman.h>
|
||||
#include <sys/types.h>
|
||||
@ -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 CHROME_BROWSER_CHROMEOS_CROSAPI_BROWSER_UTIL_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_BROWSER_UTIL_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_BROWSER_UTIL_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_BROWSER_UTIL_H_
|
||||
|
||||
#include "base/callback_forward.h"
|
||||
#include "base/containers/flat_map.h"
|
||||
#include "base/feature_list.h"
|
||||
#include "base/token.h"
|
||||
#include "chrome/browser/chromeos/crosapi/environment_provider.h"
|
||||
#include "chrome/browser/ash/crosapi/environment_provider.h"
|
||||
#include "chromeos/crosapi/mojom/crosapi.mojom.h"
|
||||
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
||||
#include "mojo/public/cpp/bindings/remote.h"
|
||||
@ -96,4 +96,4 @@ base::ScopedFD CreateStartupData(
|
||||
} // namespace browser_util
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_BROWSER_UTIL_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_BROWSER_UTIL_H_
|
||||
@ -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/crosapi/browser_util.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_util.h"
|
||||
|
||||
#include "ash/constants/ash_features.h"
|
||||
#include "base/test/scoped_feature_list.h"
|
||||
@ -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/crosapi/cert_database_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/cert_database_ash.h"
|
||||
|
||||
#include "chrome/browser/ash/profiles/profile_helper.h"
|
||||
#include "chrome/browser/profiles/profile_manager.h"
|
||||
6
chrome/browser/chromeos/crosapi/cert_database_ash.h → chrome/browser/ash/crosapi/cert_database_ash.h
6
chrome/browser/chromeos/crosapi/cert_database_ash.h → chrome/browser/ash/crosapi/cert_database_ash.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_CHROMEOS_CROSAPI_CERT_DATABASE_ASH_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_CERT_DATABASE_ASH_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_CERT_DATABASE_ASH_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_CERT_DATABASE_ASH_H_
|
||||
|
||||
#include "base/memory/weak_ptr.h"
|
||||
#include "base/optional.h"
|
||||
@ -67,4 +67,4 @@ class CertDatabaseAsh : public mojom::CertDatabase,
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_CERT_DATABASE_ASH_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_CERT_DATABASE_ASH_H_
|
||||
@ -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/crosapi/clipboard_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/clipboard_ash.h"
|
||||
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "ui/base/clipboard/clipboard.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_CHROMEOS_CROSAPI_CLIPBOARD_ASH_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_CLIPBOARD_ASH_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_CLIPBOARD_ASH_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_CLIPBOARD_ASH_H_
|
||||
|
||||
#include "base/memory/weak_ptr.h"
|
||||
#include "chromeos/crosapi/mojom/clipboard.mojom.h"
|
||||
@ -41,4 +41,4 @@ class ClipboardAsh : public mojom::Clipboard {
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_CLIPBOARD_ASH_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_CLIPBOARD_ASH_H_
|
||||
@ -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/crosapi/crosapi_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/crosapi_ash.h"
|
||||
|
||||
#include <memory>
|
||||
#include <utility>
|
||||
@ -11,24 +11,24 @@
|
||||
#include "ash/components/account_manager/account_manager.h"
|
||||
#include "ash/components/account_manager/account_manager_ash.h"
|
||||
#include "ash/components/account_manager/account_manager_factory.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_service_host_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/cert_database_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/clipboard_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/device_attributes_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/feedback_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/file_manager_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/keystore_service_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/message_center_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/metrics_reporting_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/prefs_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/screen_manager_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/select_file_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/test_controller_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/url_handler_ash.h"
|
||||
#include "chrome/browser/ash/profiles/profile_helper.h"
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/browser_process_platform_part.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_service_host_ash.h"
|
||||
#include "chrome/browser/chromeos/crosapi/cert_database_ash.h"
|
||||
#include "chrome/browser/chromeos/crosapi/clipboard_ash.h"
|
||||
#include "chrome/browser/chromeos/crosapi/device_attributes_ash.h"
|
||||
#include "chrome/browser/chromeos/crosapi/feedback_ash.h"
|
||||
#include "chrome/browser/chromeos/crosapi/file_manager_ash.h"
|
||||
#include "chrome/browser/chromeos/crosapi/keystore_service_ash.h"
|
||||
#include "chrome/browser/chromeos/crosapi/message_center_ash.h"
|
||||
#include "chrome/browser/chromeos/crosapi/metrics_reporting_ash.h"
|
||||
#include "chrome/browser/chromeos/crosapi/prefs_ash.h"
|
||||
#include "chrome/browser/chromeos/crosapi/screen_manager_ash.h"
|
||||
#include "chrome/browser/chromeos/crosapi/select_file_ash.h"
|
||||
#include "chrome/browser/chromeos/crosapi/test_controller_ash.h"
|
||||
#include "chrome/browser/chromeos/crosapi/url_handler_ash.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
#include "chrome/browser/profiles/profile_manager.h"
|
||||
#include "chromeos/components/sensors/ash/sensor_hal_dispatcher.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_CROSAPI_CROSAPI_ASH_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_CROSAPI_ASH_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_CROSAPI_ASH_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_CROSAPI_ASH_H_
|
||||
|
||||
#include <map>
|
||||
#include <memory>
|
||||
|
||||
#include "base/callback.h"
|
||||
#include "base/memory/weak_ptr.h"
|
||||
#include "chrome/browser/chromeos/crosapi/crosapi_id.h"
|
||||
#include "chrome/browser/ash/crosapi/crosapi_id.h"
|
||||
#include "chromeos/crosapi/mojom/crosapi.mojom.h"
|
||||
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
||||
#include "mojo/public/cpp/bindings/receiver_set.h"
|
||||
@ -120,4 +120,4 @@ class CrosapiAsh : public mojom::Crosapi {
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_CROSAPI_ASH_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_CROSAPI_ASH_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_CHROMEOS_CROSAPI_CROSAPI_ID_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_CROSAPI_ID_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_CROSAPI_ID_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_CROSAPI_ID_H_
|
||||
|
||||
#include "base/util/type_safety/id_type.h"
|
||||
|
||||
@ -19,4 +19,4 @@ using CrosapiId = util::IdTypeU32<internal::CrosapiIdTag>;
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_CROSAPI_ID_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_CROSAPI_ID_H_
|
||||
8
chrome/browser/chromeos/crosapi/crosapi_manager.cc → chrome/browser/ash/crosapi/crosapi_manager.cc
8
chrome/browser/chromeos/crosapi/crosapi_manager.cc → chrome/browser/ash/crosapi/crosapi_manager.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/crosapi/crosapi_manager.h"
|
||||
#include "chrome/browser/ash/crosapi/crosapi_manager.h"
|
||||
|
||||
#include <utility>
|
||||
|
||||
@ -10,9 +10,9 @@
|
||||
#include "base/check.h"
|
||||
#include "base/process/process_handle.h"
|
||||
#include "base/stl_util.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_service_host_ash.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_util.h"
|
||||
#include "chrome/browser/chromeos/crosapi/crosapi_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_service_host_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_util.h"
|
||||
#include "chrome/browser/ash/crosapi/crosapi_ash.h"
|
||||
#include "chromeos/crosapi/mojom/crosapi.mojom.h"
|
||||
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
||||
#include "mojo/public/cpp/bindings/pending_remote.h"
|
||||
@ -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 CHROME_BROWSER_CHROMEOS_CROSAPI_CROSAPI_MANAGER_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_CROSAPI_MANAGER_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_CROSAPI_MANAGER_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_CROSAPI_MANAGER_H_
|
||||
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include "base/callback.h"
|
||||
#include "chrome/browser/chromeos/crosapi/crosapi_id.h"
|
||||
#include "chrome/browser/ash/crosapi/crosapi_id.h"
|
||||
|
||||
namespace mojo {
|
||||
class PlatformChannelEndpoint;
|
||||
@ -69,4 +69,4 @@ class CrosapiManager {
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_CROSAPI_MANAGER_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_CROSAPI_MANAGER_H_
|
||||
@ -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/crosapi/device_attributes_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/device_attributes_ash.h"
|
||||
|
||||
#include <utility>
|
||||
|
||||
@ -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_CHROMEOS_CROSAPI_DEVICE_ATTRIBUTES_ASH_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_DEVICE_ATTRIBUTES_ASH_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_DEVICE_ATTRIBUTES_ASH_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_DEVICE_ATTRIBUTES_ASH_H_
|
||||
|
||||
#include "chromeos/crosapi/mojom/device_attributes.mojom.h"
|
||||
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
||||
@ -39,4 +39,4 @@ class DeviceAttributesAsh : public mojom::DeviceAttributes {
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_DEVICE_ATTRIBUTES_ASH_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_DEVICE_ATTRIBUTES_ASH_H_
|
||||
@ -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/crosapi/environment_provider.h"
|
||||
#include "chrome/browser/ash/crosapi/environment_provider.h"
|
||||
|
||||
#include "base/files/file_util.h"
|
||||
#include "base/system/sys_info.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_CHROMEOS_CROSAPI_ENVIRONMENT_PROVIDER_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_ENVIRONMENT_PROVIDER_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_ENVIRONMENT_PROVIDER_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_ENVIRONMENT_PROVIDER_H_
|
||||
|
||||
#include <string>
|
||||
|
||||
@ -43,4 +43,4 @@ class EnvironmentProvider {
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_ENVIRONMENT_PROVIDER_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_ENVIRONMENT_PROVIDER_H_
|
||||
@ -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/crosapi/fake_browser_manager.h"
|
||||
#include "chrome/browser/ash/crosapi/fake_browser_manager.h"
|
||||
|
||||
#include "chrome/browser/component_updater/cros_component_manager.h"
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#ifndef CHROME_BROWSER_CHROMEOS_CROSAPI_FAKE_BROWSER_MANAGER_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_FAKE_BROWSER_MANAGER_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_FAKE_BROWSER_MANAGER_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_FAKE_BROWSER_MANAGER_H_
|
||||
|
||||
#include "base/values.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_manager.h"
|
||||
|
||||
namespace crosapi {
|
||||
|
||||
@ -48,4 +48,4 @@ class FakeBrowserManager : public BrowserManager {
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_FAKE_BROWSER_MANAGER_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_FAKE_BROWSER_MANAGER_H_
|
||||
@ -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/crosapi/feedback_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/feedback_ash.h"
|
||||
|
||||
#include "chrome/browser/ash/login/users/chrome_user_manager.h"
|
||||
#include "chrome/browser/ash/profiles/profile_helper.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_CHROMEOS_CROSAPI_FEEDBACK_ASH_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_FEEDBACK_ASH_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_FEEDBACK_ASH_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_FEEDBACK_ASH_H_
|
||||
|
||||
#include "chromeos/crosapi/mojom/feedback.mojom.h"
|
||||
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
||||
@ -31,4 +31,4 @@ class FeedbackAsh : public mojom::Feedback {
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_FEEDBACK_ASH_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_FEEDBACK_ASH_H_
|
||||
2
chrome/browser/chromeos/crosapi/file_manager_ash.cc → chrome/browser/ash/crosapi/file_manager_ash.cc
2
chrome/browser/chromeos/crosapi/file_manager_ash.cc → chrome/browser/ash/crosapi/file_manager_ash.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/crosapi/file_manager_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/file_manager_ash.h"
|
||||
|
||||
#include "base/bind.h"
|
||||
#include "base/callback.h"
|
||||
6
chrome/browser/chromeos/crosapi/file_manager_ash.h → chrome/browser/ash/crosapi/file_manager_ash.h
6
chrome/browser/chromeos/crosapi/file_manager_ash.h → chrome/browser/ash/crosapi/file_manager_ash.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_CHROMEOS_CROSAPI_FILE_MANAGER_ASH_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_FILE_MANAGER_ASH_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_FILE_MANAGER_ASH_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_FILE_MANAGER_ASH_H_
|
||||
|
||||
#include "chromeos/crosapi/mojom/file_manager.mojom.h"
|
||||
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
||||
@ -37,4 +37,4 @@ class FileManagerAsh : public mojom::FileManager {
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_FILE_MANAGER_ASH_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_FILE_MANAGER_ASH_H_
|
||||
@ -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/crosapi/keystore_service_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/keystore_service_ash.h"
|
||||
|
||||
#include <utility>
|
||||
|
||||
@ -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_CHROMEOS_CROSAPI_KEYSTORE_SERVICE_ASH_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_KEYSTORE_SERVICE_ASH_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_KEYSTORE_SERVICE_ASH_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_KEYSTORE_SERVICE_ASH_H_
|
||||
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
@ -102,4 +102,4 @@ class KeystoreServiceAsh : public mojom::KeystoreService {
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_KEYSTORE_SERVICE_ASH_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_KEYSTORE_SERVICE_ASH_H_
|
||||
@ -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/crosapi/message_center_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/message_center_ash.h"
|
||||
|
||||
#include <string>
|
||||
#include <utility>
|
||||
@ -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_CHROMEOS_CROSAPI_MESSAGE_CENTER_ASH_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_MESSAGE_CENTER_ASH_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_MESSAGE_CENTER_ASH_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_MESSAGE_CENTER_ASH_H_
|
||||
|
||||
#include "chromeos/crosapi/mojom/message_center.mojom.h"
|
||||
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
||||
@ -37,4 +37,4 @@ class MessageCenterAsh : public mojom::MessageCenter {
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_MESSAGE_CENTER_ASH_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_MESSAGE_CENTER_ASH_H_
|
||||
@ -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/crosapi/message_center_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/message_center_ash.h"
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
@ -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/crosapi/metrics_reporting_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/metrics_reporting_ash.h"
|
||||
|
||||
#include <utility>
|
||||
|
||||
@ -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_CHROMEOS_CROSAPI_METRICS_REPORTING_ASH_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_METRICS_REPORTING_ASH_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_METRICS_REPORTING_ASH_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_METRICS_REPORTING_ASH_H_
|
||||
|
||||
#include <memory>
|
||||
|
||||
@ -69,4 +69,4 @@ class MetricsReportingAsh : public mojom::MetricsReporting {
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_METRICS_REPORTING_ASH_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_METRICS_REPORTING_ASH_H_
|
||||
@ -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/crosapi/metrics_reporting_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/metrics_reporting_ash.h"
|
||||
|
||||
#include <memory>
|
||||
|
||||
@ -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/crosapi/prefs_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/prefs_ash.h"
|
||||
|
||||
#include <utility>
|
||||
|
||||
@ -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_CHROMEOS_CROSAPI_PREFS_ASH_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_PREFS_ASH_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_PREFS_ASH_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_PREFS_ASH_H_
|
||||
|
||||
#include <map>
|
||||
#include <memory>
|
||||
@ -87,4 +87,4 @@ class PrefsAsh : public mojom::Prefs, public ProfileManagerObserver {
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_PREFS_ASH_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_PREFS_ASH_H_
|
||||
@ -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/crosapi/prefs_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/prefs_ash.h"
|
||||
|
||||
#include <memory>
|
||||
|
||||
@ -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/crosapi/screen_manager_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/screen_manager_ash.h"
|
||||
|
||||
#include <map>
|
||||
#include <utility>
|
||||
@ -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_CHROMEOS_CROSAPI_SCREEN_MANAGER_ASH_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_SCREEN_MANAGER_ASH_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_SCREEN_MANAGER_ASH_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_SCREEN_MANAGER_ASH_H_
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
@ -55,4 +55,4 @@ class ScreenManagerAsh : public mojom::ScreenManager {
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_SCREEN_MANAGER_ASH_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_SCREEN_MANAGER_ASH_H_
|
||||
@ -8,7 +8,7 @@
|
||||
#include "base/memory/scoped_refptr.h"
|
||||
#include "base/task/task_traits.h"
|
||||
#include "base/task/thread_pool.h"
|
||||
#include "chrome/browser/chromeos/crosapi/screen_manager_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/screen_manager_ash.h"
|
||||
#include "chrome/browser/ui/browser.h"
|
||||
#include "chrome/browser/ui/browser_window.h"
|
||||
#include "chrome/test/base/in_process_browser_test.h"
|
||||
4
chrome/browser/chromeos/crosapi/select_file_ash.cc → chrome/browser/ash/crosapi/select_file_ash.cc
4
chrome/browser/chromeos/crosapi/select_file_ash.cc → chrome/browser/ash/crosapi/select_file_ash.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/crosapi/select_file_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/select_file_ash.h"
|
||||
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
@ -13,7 +13,7 @@
|
||||
#include "base/files/file_path.h"
|
||||
#include "base/memory/ref_counted.h"
|
||||
#include "base/numerics/ranges.h"
|
||||
#include "chrome/browser/chromeos/crosapi/window_util.h"
|
||||
#include "chrome/browser/ash/crosapi/window_util.h"
|
||||
#include "chrome/browser/ui/views/select_file_dialog_extension.h"
|
||||
#include "chromeos/crosapi/mojom/select_file.mojom.h"
|
||||
#include "ui/shell_dialogs/select_file_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_CHROMEOS_CROSAPI_SELECT_FILE_ASH_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_SELECT_FILE_ASH_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_SELECT_FILE_ASH_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_SELECT_FILE_ASH_H_
|
||||
|
||||
#include "chromeos/crosapi/mojom/select_file.mojom.h"
|
||||
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
||||
@ -33,4 +33,4 @@ class SelectFileAsh : public mojom::SelectFile {
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_SELECT_FILE_ASH_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_SELECT_FILE_ASH_H_
|
||||
@ -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/crosapi/test_controller_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/test_controller_ash.h"
|
||||
|
||||
#include "ash/public/cpp/tablet_mode.h"
|
||||
#include "ash/shell.h"
|
||||
@ -12,7 +12,7 @@
|
||||
#include "base/optional.h"
|
||||
#include "base/task/post_task.h"
|
||||
#include "build/chromeos_buildflags.h"
|
||||
#include "chrome/browser/chromeos/crosapi/window_util.h"
|
||||
#include "chrome/browser/ash/crosapi/window_util.h"
|
||||
#include "ui/aura/window.h"
|
||||
#include "ui/aura/window_event_dispatcher.h"
|
||||
#include "ui/aura/window_tree_host.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_CHROMEOS_CROSAPI_TEST_CONTROLLER_ASH_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_TEST_CONTROLLER_ASH_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_TEST_CONTROLLER_ASH_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_TEST_CONTROLLER_ASH_H_
|
||||
|
||||
#include "chromeos/crosapi/mojom/test_controller.mojom.h"
|
||||
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
||||
@ -56,4 +56,4 @@ class TestControllerAsh : public mojom::TestController {
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_TEST_CONTROLLER_ASH_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_TEST_CONTROLLER_ASH_H_
|
||||
@ -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/crosapi/test_mojo_connection_manager.h"
|
||||
#include "chrome/browser/ash/crosapi/test_mojo_connection_manager.h"
|
||||
|
||||
#include <fcntl.h>
|
||||
|
||||
@ -12,9 +12,9 @@
|
||||
#include "base/path_service.h"
|
||||
#include "base/task/task_traits.h"
|
||||
#include "base/task/thread_pool.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_util.h"
|
||||
#include "chrome/browser/chromeos/crosapi/crosapi_manager.h"
|
||||
#include "chrome/browser/chromeos/crosapi/environment_provider.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_util.h"
|
||||
#include "chrome/browser/ash/crosapi/crosapi_manager.h"
|
||||
#include "chrome/browser/ash/crosapi/environment_provider.h"
|
||||
#include "chrome/common/chrome_paths.h"
|
||||
#include "mojo/public/cpp/platform/named_platform_channel.h"
|
||||
#include "mojo/public/cpp/platform/platform_channel.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_CHROMEOS_CROSAPI_TEST_MOJO_CONNECTION_MANAGER_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_TEST_MOJO_CONNECTION_MANAGER_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_TEST_MOJO_CONNECTION_MANAGER_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_TEST_MOJO_CONNECTION_MANAGER_H_
|
||||
|
||||
#include <memory>
|
||||
#include <utility>
|
||||
@ -64,4 +64,4 @@ class TestMojoConnectionManager {
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_TEST_MOJO_CONNECTION_MANAGER_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_TEST_MOJO_CONNECTION_MANAGER_H_
|
||||
@ -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/crosapi/test_mojo_connection_manager.h"
|
||||
#include "chrome/browser/ash/crosapi/test_mojo_connection_manager.h"
|
||||
|
||||
#include <fcntl.h>
|
||||
|
||||
@ -24,10 +24,10 @@
|
||||
#include "base/test/multiprocess_test.h"
|
||||
#include "base/test/task_environment.h"
|
||||
#include "base/test/test_timeouts.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_service_host_ash.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_service_host_observer.h"
|
||||
#include "chrome/browser/chromeos/crosapi/crosapi_ash.h"
|
||||
#include "chrome/browser/chromeos/crosapi/crosapi_manager.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_service_host_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_service_host_observer.h"
|
||||
#include "chrome/browser/ash/crosapi/crosapi_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/crosapi_manager.h"
|
||||
#include "chrome/test/base/scoped_testing_local_state.h"
|
||||
#include "chrome/test/base/testing_browser_process.h"
|
||||
#include "chrome/test/base/testing_profile_manager.h"
|
||||
2
chrome/browser/chromeos/crosapi/url_handler_ash.cc → chrome/browser/ash/crosapi/url_handler_ash.cc
2
chrome/browser/chromeos/crosapi/url_handler_ash.cc → chrome/browser/ash/crosapi/url_handler_ash.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/crosapi/url_handler_ash.h"
|
||||
#include "chrome/browser/ash/crosapi/url_handler_ash.h"
|
||||
|
||||
#include "chrome/browser/profiles/profile_manager.h"
|
||||
#include "chrome/browser/ui/settings_window_manager_chromeos.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_CHROMEOS_CROSAPI_URL_HANDLER_ASH_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_URL_HANDLER_ASH_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_URL_HANDLER_ASH_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_URL_HANDLER_ASH_H_
|
||||
|
||||
#include "chromeos/crosapi/mojom/url_handler.mojom.h"
|
||||
#include "mojo/public/cpp/bindings/receiver_set.h"
|
||||
@ -30,4 +30,4 @@ class UrlHandlerAsh : public mojom::UrlHandler {
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_URL_HANDLER_ASH_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_URL_HANDLER_ASH_H_
|
||||
@ -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/crosapi/window_util.h"
|
||||
#include "chrome/browser/ash/crosapi/window_util.h"
|
||||
|
||||
#include "ash/shell.h"
|
||||
#include "components/exo/shell_surface_util.h"
|
||||
@ -5,8 +5,8 @@
|
||||
// This file contains window utility functions for ash's implementation of
|
||||
// crosapi.
|
||||
|
||||
#ifndef CHROME_BROWSER_CHROMEOS_CROSAPI_WINDOW_UTIL_H_
|
||||
#define CHROME_BROWSER_CHROMEOS_CROSAPI_WINDOW_UTIL_H_
|
||||
#ifndef CHROME_BROWSER_ASH_CROSAPI_WINDOW_UTIL_H_
|
||||
#define CHROME_BROWSER_ASH_CROSAPI_WINDOW_UTIL_H_
|
||||
|
||||
#include <string>
|
||||
|
||||
@ -22,4 +22,4 @@ aura::Window* GetShellSurfaceWindow(const std::string& app_id);
|
||||
|
||||
} // namespace crosapi
|
||||
|
||||
#endif // CHROME_BROWSER_CHROMEOS_CROSAPI_WINDOW_UTIL_H_
|
||||
#endif // CHROME_BROWSER_ASH_CROSAPI_WINDOW_UTIL_H_
|
||||
@ -5,7 +5,7 @@
|
||||
#include "chrome/browser/ash/system_logs/crosapi_system_log_source.h"
|
||||
|
||||
#include "base/bind.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_manager.h"
|
||||
|
||||
namespace system_logs {
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
#include "base/memory/weak_ptr.h"
|
||||
#include "base/values.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_manager_observer.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_manager_observer.h"
|
||||
#include "components/feedback/system_logs/system_logs_source.h"
|
||||
|
||||
namespace system_logs {
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
#include "base/bind.h"
|
||||
#include "base/macros.h"
|
||||
#include "base/run_loop.h"
|
||||
#include "chrome/browser/chromeos/crosapi/fake_browser_manager.h"
|
||||
#include "chrome/browser/ash/crosapi/fake_browser_manager.h"
|
||||
#include "content/public/test/browser_task_environment.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
|
||||
|
||||
@ -589,6 +589,55 @@ source_set("chromeos") {
|
||||
"../ash/certificate_provider/sign_requests.h",
|
||||
"../ash/certificate_provider/thread_safe_certificate_map.cc",
|
||||
"../ash/certificate_provider/thread_safe_certificate_map.h",
|
||||
"../ash/crosapi/browser_loader.cc",
|
||||
"../ash/crosapi/browser_loader.h",
|
||||
"../ash/crosapi/browser_manager.cc",
|
||||
"../ash/crosapi/browser_manager.h",
|
||||
"../ash/crosapi/browser_manager_observer.h",
|
||||
"../ash/crosapi/browser_service_host_ash.cc",
|
||||
"../ash/crosapi/browser_service_host_ash.h",
|
||||
"../ash/crosapi/browser_service_host_observer.h",
|
||||
"../ash/crosapi/browser_util.cc",
|
||||
"../ash/crosapi/browser_util.h",
|
||||
"../ash/crosapi/cert_database_ash.cc",
|
||||
"../ash/crosapi/cert_database_ash.h",
|
||||
"../ash/crosapi/clipboard_ash.cc",
|
||||
"../ash/crosapi/clipboard_ash.h",
|
||||
"../ash/crosapi/crosapi_ash.cc",
|
||||
"../ash/crosapi/crosapi_ash.h",
|
||||
"../ash/crosapi/crosapi_id.h",
|
||||
"../ash/crosapi/crosapi_manager.cc",
|
||||
"../ash/crosapi/crosapi_manager.h",
|
||||
"../ash/crosapi/device_attributes_ash.cc",
|
||||
"../ash/crosapi/device_attributes_ash.h",
|
||||
"../ash/crosapi/environment_provider.cc",
|
||||
"../ash/crosapi/environment_provider.h",
|
||||
"../ash/crosapi/fake_browser_manager.cc",
|
||||
"../ash/crosapi/fake_browser_manager.h",
|
||||
"../ash/crosapi/feedback_ash.cc",
|
||||
"../ash/crosapi/feedback_ash.h",
|
||||
"../ash/crosapi/file_manager_ash.cc",
|
||||
"../ash/crosapi/file_manager_ash.h",
|
||||
"../ash/crosapi/keystore_service_ash.cc",
|
||||
"../ash/crosapi/keystore_service_ash.h",
|
||||
"../ash/crosapi/message_center_ash.cc",
|
||||
"../ash/crosapi/message_center_ash.h",
|
||||
"../ash/crosapi/metrics_reporting_ash.cc",
|
||||
"../ash/crosapi/metrics_reporting_ash.h",
|
||||
"../ash/crosapi/prefs_ash.cc",
|
||||
"../ash/crosapi/prefs_ash.h",
|
||||
"../ash/crosapi/screen_manager_ash.cc",
|
||||
"../ash/crosapi/screen_manager_ash.h",
|
||||
"../ash/crosapi/select_file_ash.cc",
|
||||
"../ash/crosapi/select_file_ash.h",
|
||||
"../ash/crosapi/test_controller_ash.cc",
|
||||
"../ash/crosapi/test_controller_ash.h",
|
||||
"../ash/crosapi/test_mojo_connection_manager.cc",
|
||||
"../ash/crosapi/test_mojo_connection_manager.h",
|
||||
"../ash/crosapi/url_handler_ash.cc",
|
||||
"../ash/crosapi/url_handler_ash.h",
|
||||
"../ash/crosapi/window_util.cc",
|
||||
"../ash/crosapi/window_util.h",
|
||||
"../ash/login/app_mode/kiosk_launch_controller.cc",
|
||||
"../ash/login/app_mode/kiosk_launch_controller.h",
|
||||
"../ash/login/auth/chrome_cryptohome_authenticator.cc",
|
||||
@ -1591,55 +1640,6 @@ source_set("chromeos") {
|
||||
"chrome_content_browser_client_chromeos_part.h",
|
||||
"concierge_helper_service.cc",
|
||||
"concierge_helper_service.h",
|
||||
"crosapi/browser_loader.cc",
|
||||
"crosapi/browser_loader.h",
|
||||
"crosapi/browser_manager.cc",
|
||||
"crosapi/browser_manager.h",
|
||||
"crosapi/browser_manager_observer.h",
|
||||
"crosapi/browser_service_host_ash.cc",
|
||||
"crosapi/browser_service_host_ash.h",
|
||||
"crosapi/browser_service_host_observer.h",
|
||||
"crosapi/browser_util.cc",
|
||||
"crosapi/browser_util.h",
|
||||
"crosapi/cert_database_ash.cc",
|
||||
"crosapi/cert_database_ash.h",
|
||||
"crosapi/clipboard_ash.cc",
|
||||
"crosapi/clipboard_ash.h",
|
||||
"crosapi/crosapi_ash.cc",
|
||||
"crosapi/crosapi_ash.h",
|
||||
"crosapi/crosapi_id.h",
|
||||
"crosapi/crosapi_manager.cc",
|
||||
"crosapi/crosapi_manager.h",
|
||||
"crosapi/device_attributes_ash.cc",
|
||||
"crosapi/device_attributes_ash.h",
|
||||
"crosapi/environment_provider.cc",
|
||||
"crosapi/environment_provider.h",
|
||||
"crosapi/fake_browser_manager.cc",
|
||||
"crosapi/fake_browser_manager.h",
|
||||
"crosapi/feedback_ash.cc",
|
||||
"crosapi/feedback_ash.h",
|
||||
"crosapi/file_manager_ash.cc",
|
||||
"crosapi/file_manager_ash.h",
|
||||
"crosapi/keystore_service_ash.cc",
|
||||
"crosapi/keystore_service_ash.h",
|
||||
"crosapi/message_center_ash.cc",
|
||||
"crosapi/message_center_ash.h",
|
||||
"crosapi/metrics_reporting_ash.cc",
|
||||
"crosapi/metrics_reporting_ash.h",
|
||||
"crosapi/prefs_ash.cc",
|
||||
"crosapi/prefs_ash.h",
|
||||
"crosapi/screen_manager_ash.cc",
|
||||
"crosapi/screen_manager_ash.h",
|
||||
"crosapi/select_file_ash.cc",
|
||||
"crosapi/select_file_ash.h",
|
||||
"crosapi/test_controller_ash.cc",
|
||||
"crosapi/test_controller_ash.h",
|
||||
"crosapi/test_mojo_connection_manager.cc",
|
||||
"crosapi/test_mojo_connection_manager.h",
|
||||
"crosapi/url_handler_ash.cc",
|
||||
"crosapi/url_handler_ash.h",
|
||||
"crosapi/window_util.cc",
|
||||
"crosapi/window_util.h",
|
||||
"crostini/ansible/ansible_management_service.cc",
|
||||
"crostini/ansible/ansible_management_service.h",
|
||||
"crostini/ansible/ansible_management_service_factory.cc",
|
||||
@ -3472,6 +3472,12 @@ source_set("unit_tests") {
|
||||
"../ash/authpolicy/authpolicy_credentials_manager_unittest.cc",
|
||||
"../ash/authpolicy/authpolicy_helper.unittest.cc",
|
||||
"../ash/certificate_provider/certificate_provider_service_unittest.cc",
|
||||
"../ash/crosapi/browser_loader_unittest.cc",
|
||||
"../ash/crosapi/browser_util_unittest.cc",
|
||||
"../ash/crosapi/message_center_ash_unittest.cc",
|
||||
"../ash/crosapi/metrics_reporting_ash_unittest.cc",
|
||||
"../ash/crosapi/prefs_ash_unittest.cc",
|
||||
"../ash/crosapi/test_mojo_connection_manager_unittest.cc",
|
||||
"../ash/login/auth/cryptohome_authenticator_unittest.cc",
|
||||
"../ash/login/demo_mode/demo_extensions_external_loader_unittest.cc",
|
||||
"../ash/login/demo_mode/demo_mode_detector_unittest.cc",
|
||||
@ -3693,12 +3699,6 @@ source_set("unit_tests") {
|
||||
"child_accounts/usage_time_state_notifier_unittest.cc",
|
||||
"chrome_content_browser_client_chromeos_part_unittest.cc",
|
||||
"concierge_helper_service_unittest.cc",
|
||||
"crosapi/browser_loader_unittest.cc",
|
||||
"crosapi/browser_util_unittest.cc",
|
||||
"crosapi/message_center_ash_unittest.cc",
|
||||
"crosapi/metrics_reporting_ash_unittest.cc",
|
||||
"crosapi/prefs_ash_unittest.cc",
|
||||
"crosapi/test_mojo_connection_manager_unittest.cc",
|
||||
"crostini/ansible/ansible_management_service_unittest.cc",
|
||||
"crostini/crostini_disk_unittest.cc",
|
||||
"crostini/crostini_export_import_unittest.cc",
|
||||
|
||||
@ -45,6 +45,8 @@
|
||||
#include "chrome/browser/ash/app_mode/kiosk_app_manager.h"
|
||||
#include "chrome/browser/ash/app_mode/kiosk_mode_idle_app_name_notification.h"
|
||||
#include "chrome/browser/ash/app_mode/web_app/web_kiosk_app_manager.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/ash/crosapi/crosapi_manager.h"
|
||||
#include "chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.h"
|
||||
#include "chrome/browser/ash/login/demo_mode/demo_session.h"
|
||||
#include "chrome/browser/ash/login/helper.h"
|
||||
@ -68,8 +70,6 @@
|
||||
#include "chrome/browser/chromeos/arc/enterprise/arc_data_snapshotd_delegate.h"
|
||||
#include "chrome/browser/chromeos/arc/session/arc_service_launcher.h"
|
||||
#include "chrome/browser/chromeos/boot_times_recorder.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/chromeos/crosapi/crosapi_manager.h"
|
||||
#include "chrome/browser/chromeos/crostini/crostini_unsupported_action_notifier.h"
|
||||
#include "chrome/browser/chromeos/crostini/crosvm_metrics.h"
|
||||
#include "chrome/browser/chromeos/dbus/chrome_features_service_provider.h"
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
#include "base/metrics/histogram_macros.h"
|
||||
#include "base/sequence_checker.h"
|
||||
#include "base/sequenced_task_runner.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/chromeos/policy/cached_policy_key_loader_chromeos.h"
|
||||
#include "chrome/browser/chromeos/policy/value_validation/onc_user_policy_value_validator.h"
|
||||
#include "chrome/browser/lifetime/application_lifetime.h"
|
||||
|
||||
@ -25,6 +25,7 @@
|
||||
#include "base/strings/string_util.h"
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "chrome/browser/ash/accessibility/magnification_manager.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_util.h"
|
||||
#include "chrome/browser/ash/login/login_pref_names.h"
|
||||
#include "chrome/browser/ash/login/session/user_session_manager.h"
|
||||
#include "chrome/browser/ash/profiles/profile_helper.h"
|
||||
@ -37,7 +38,6 @@
|
||||
#include "chrome/browser/chrome_notification_types.h"
|
||||
#include "chrome/browser/chromeos/base/locale_util.h"
|
||||
#include "chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_service.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_util.h"
|
||||
#include "chrome/browser/chromeos/drive/file_system_util.h"
|
||||
#include "chrome/browser/chromeos/input_method/input_method_persistence.h"
|
||||
#include "chrome/browser/chromeos/input_method/input_method_syncer.h"
|
||||
|
||||
@ -50,7 +50,7 @@ const ComponentConfig kConfigs[] = {
|
||||
{"demo-mode-resources", ComponentConfig::PolicyType::kEnvVersion, "1.0",
|
||||
"93c093ebac788581389015e9c59c5af111d2fa5174d206eb795042e6376cbd10"},
|
||||
// NOTE: If you change the lacros component names, you must also update
|
||||
// chrome/browser/chromeos/crosapi/browser_loader.cc.
|
||||
// chrome/browser/ash/crosapi/browser_loader.cc.
|
||||
{"lacros-fishfood", ComponentConfig::PolicyType::kLacros, nullptr,
|
||||
"7a85ffb4b316a3b89135a3f43660ef3049950a61a2f8df4237e1ec213852b848"},
|
||||
{"lacros-dogfood-dev", ComponentConfig::PolicyType::kLacros, nullptr,
|
||||
|
||||
@ -29,11 +29,11 @@
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
#include "base/strings/string_split.h"
|
||||
#include "base/system/sys_info.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/ash/system_logs/iwlwifi_dump_log_source.h"
|
||||
#include "chrome/browser/ash/system_logs/single_debug_daemon_log_source.h"
|
||||
#include "chrome/browser/ash/system_logs/single_log_file_log_source.h"
|
||||
#include "chrome/browser/chromeos/arc/arc_util.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/extensions/component_loader.h"
|
||||
#include "chrome/browser/extensions/extension_service.h"
|
||||
#include "components/feedback/system_logs/system_logs_source.h"
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
#include "base/bind.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/signin/identity_manager_factory.h"
|
||||
#include "components/signin/public/identity_manager/identity_manager.h"
|
||||
#include "google_apis/gaia/gaia_auth_util.h"
|
||||
|
||||
@ -15,6 +15,8 @@
|
||||
#include "components/feedback/system_logs/system_logs_fetcher.h"
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
#include "chrome/browser/ash/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_util.h"
|
||||
#include "chrome/browser/ash/system_logs/command_line_log_source.h"
|
||||
#include "chrome/browser/ash/system_logs/crosapi_system_log_source.h"
|
||||
#include "chrome/browser/ash/system_logs/dbus_log_source.h"
|
||||
@ -25,8 +27,6 @@
|
||||
#include "chrome/browser/ash/system_logs/shill_log_source.h"
|
||||
#include "chrome/browser/ash/system_logs/touch_log_source.h"
|
||||
#include "chrome/browser/ash/system_logs/ui_hierarchy_log_source.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_util.h"
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
@ -42,13 +42,13 @@
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
#include "ash/public/ash_interfaces.h"
|
||||
#include "base/strings/stringprintf.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_util.h"
|
||||
#include "chrome/browser/ash/login/demo_mode/demo_session.h"
|
||||
#include "chrome/browser/ash/login/login_pref_names.h"
|
||||
#include "chrome/browser/ash/settings/cros_settings.h"
|
||||
#include "chrome/browser/chromeos/arc/arc_util.h"
|
||||
#include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_util.h"
|
||||
#include "chrome/browser/metrics/chromeos_metrics_provider.h"
|
||||
#include "chrome/browser/metrics/enrollment_status.h"
|
||||
#include "chromeos/dbus/util/version_loader.h"
|
||||
|
||||
@ -11,10 +11,10 @@
|
||||
#include "chrome/browser/apps/app_service/app_service_proxy.h"
|
||||
#include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
|
||||
#include "chrome/browser/apps/app_service/menu_util.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/chromeos/borealis/borealis_service.h"
|
||||
#include "chrome/browser/chromeos/borealis/borealis_shutdown_monitor.h"
|
||||
#include "chrome/browser/chromeos/borealis/borealis_util.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/chromeos/crostini/crostini_manager.h"
|
||||
#include "chrome/browser/chromeos/crostini/crostini_terminal.h"
|
||||
#include "chrome/browser/chromeos/crostini/crostini_util.h"
|
||||
|
||||
@ -14,9 +14,9 @@
|
||||
#include "ash/public/cpp/app_list/internal_app_id_constants.h"
|
||||
#include "ash/public/cpp/ash_pref_names.h"
|
||||
#include "base/values.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_util.h"
|
||||
#include "chrome/browser/ash/login/demo_mode/demo_session.h"
|
||||
#include "chrome/browser/ash/profiles/profile_helper.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_util.h"
|
||||
#include "chrome/browser/prefs/pref_service_syncable_util.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
#include "chrome/browser/sync/profile_sync_service_factory.h"
|
||||
|
||||
@ -11,8 +11,8 @@
|
||||
#include "base/time/time.h"
|
||||
#include "chrome/browser/apps/app_service/app_service_proxy.h"
|
||||
#include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_util.h"
|
||||
#include "chrome/browser/ash/profiles/profile_helper.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_util.h"
|
||||
#include "chrome/browser/chromeos/crostini/crostini_features.h"
|
||||
#include "chrome/browser/chromeos/crostini/crostini_force_close_watcher.h"
|
||||
#include "chrome/browser/chromeos/crostini/crostini_shelf_utils.h"
|
||||
|
||||
@ -15,10 +15,10 @@
|
||||
#include "base/containers/contains.h"
|
||||
#include "base/feature_list.h"
|
||||
#include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_util.h"
|
||||
#include "chrome/browser/chromeos/arc/arc_util.h"
|
||||
#include "chrome/browser/chromeos/borealis/borealis_service.h"
|
||||
#include "chrome/browser/chromeos/borealis/borealis_window_manager.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_util.h"
|
||||
#include "chrome/browser/chromeos/crostini/crostini_features.h"
|
||||
#include "chrome/browser/chromeos/crostini/crostini_shelf_utils.h"
|
||||
#include "chrome/browser/chromeos/plugin_vm/plugin_vm_util.h"
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
#include "chrome/browser/apps/app_service/app_service_proxy.h"
|
||||
#include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
|
||||
#include "chrome/browser/apps/app_service/menu_util.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/chromeos/arc/app_shortcuts/arc_app_shortcuts_menu_builder.h"
|
||||
#include "chrome/browser/chromeos/borealis/borealis_service.h"
|
||||
#include "chrome/browser/chromeos/borealis/borealis_shutdown_monitor.h"
|
||||
#include "chrome/browser/chromeos/borealis/borealis_util.h"
|
||||
#include "chrome/browser/chromeos/crosapi/browser_manager.h"
|
||||
#include "chrome/browser/chromeos/crostini/crostini_manager.h"
|
||||
#include "chrome/browser/chromeos/crostini/crostini_shelf_utils.h"
|
||||
#include "chrome/browser/chromeos/crostini/crostini_terminal.h"
|
||||
|
||||
@ -2424,8 +2424,7 @@ if (!is_android) {
|
||||
# Browser tests for functionality that is only intended to be present in
|
||||
# ash-chrome, not lacros-chrome.
|
||||
if (is_chromeos_ash && !is_chromeos_lacros) {
|
||||
sources +=
|
||||
[ "../browser/chromeos/crosapi/screen_manager_ash_browsertest.cc" ]
|
||||
sources += [ "../browser/ash/crosapi/screen_manager_ash_browsertest.cc" ]
|
||||
}
|
||||
|
||||
# NOTE: This is the main "browser_tests" section for |is_chromeos_ash|.
|
||||
|
||||
@ -401,7 +401,7 @@ void BrowserTestBase::SetUp() {
|
||||
// to be obtained and used to launch lacros-chrome so that a mojo connection
|
||||
// between lacros-chrome and ash-chrome can be established.
|
||||
// For more details, please see:
|
||||
// //chrome/browser/chromeos/crosapi/test_mojo_connection_manager.h.
|
||||
// //chrome/browser/ash/crosapi/test_mojo_connection_manager.h.
|
||||
{
|
||||
// TODO(crbug.com/1127581): Switch to use |kLacrosMojoSocketForTesting| in
|
||||
// //ash/constants/ash_switches.h.
|
||||
|
||||
@ -48,7 +48,7 @@ Cocoa, but much smaller. It's also mostly asynchronous for performance reasons.
|
||||
The API lives in
|
||||
[//chromeos/crosapi](https://chromium.googlesource.com/chromium/src.git/+/master/chromeos/crosapi).
|
||||
The ash-side implementation lives in
|
||||
[//chrome/browser/chromeos/crosapi](https://chromium.googlesource.com/chromium/src.git/+/master/chrome/browser/chromeos/crosapi).
|
||||
[//chrome/browser/ash/crosapi](https://chromium.googlesource.com/chromium/src.git/+/master/chrome/browser/ash/crosapi).
|
||||
|
||||
Code can be conditionally compiled into lacros via
|
||||
BUILDFLAG(IS_CHROMEOS_LACROS).
|
||||
|
||||
Reference in New Issue
Block a user