chromium/src
0
Fork 0
Code Activity

Move chrome/browser/ash/guest_os/virtual_machines

Browse Source 
... to chromeos/ash/experiences/guest_os/virtual_machines.

Bug: b:389830491
Change-Id: I3d5989a39b0fd259b8d70ab78abe3ea83393d887
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6172701
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Commit-Queue: Jun Ishiguro <junis@google.com>
Cr-Commit-Position: refs/heads/main@{#1407672}
This commit is contained in:
Jun Ishiguro
2025-01-16 17:33:51 -08:00
committed by Chromium LUCI CQ
parent a11d1b46c2
commit 6ab7c652d1
16 changed files with 19 additions and 34 deletions

2
chrome/browser/ash/borealis/BUILD.gn

@ -94,7 +94,6 @@ static_library("borealis") {
"//ash/public/cpp",
"//chrome/app:generated_resources",
"//chrome/browser/ash/guest_os/infra",
"//chrome/browser/ash/guest_os/virtual_machines",
"//chrome/browser/ash/profiles",
"//chrome/common:chrome_features",
"//chromeos/ash/components/borealis",
@ -107,6 +106,7 @@ static_library("borealis") {
"//chromeos/ash/components/install_attributes",
"//chromeos/ash/components/settings",
"//chromeos/ash/components/system",
"//chromeos/ash/experiences/guest_os/virtual_machines",
"//chromeos/ui/base",
"//components/crx_file",
"//components/exo",

2
chrome/browser/ash/borealis/borealis_features.cc

@ -18,7 +18,6 @@
#include "chrome/browser/ash/borealis/borealis_hardware_checker.h"
#include "chrome/browser/ash/borealis/borealis_prefs.h"
#include "chrome/browser/ash/guest_os/infra/cached_callback.h"
#include "chrome/browser/ash/guest_os/virtual_machines/virtual_machines_util.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/policy/profile_policy_connector.h"
#include "chrome/browser/profiles/profile.h"
@ -26,6 +25,7 @@
#include "chromeos/ash/components/install_attributes/install_attributes.h"
#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/experiences/guest_os/virtual_machines/virtual_machines_util.h"
#include "components/prefs/pref_service.h"
#include "components/version_info/channel.h"

4
chrome/browser/ash/bruschetta/BUILD.gn

@ -62,13 +62,13 @@ static_library("bruschetta") {
"//chrome/browser/ash/app_list",
"//chrome/browser/ash/crostini",
"//chrome/browser/ash/guest_os/public",
"//chrome/browser/ash/guest_os/virtual_machines",
"//chrome/browser/ash/profiles",
"//chrome/browser/profiles",
"//chromeos/ash/components/dbus/attestation",
"//chromeos/ash/components/dbus/dlcservice",
"//chromeos/ash/components/settings",
"//chromeos/ash/components/system",
"//chromeos/ash/experiences/guest_os/virtual_machines",
"//components/policy:generated",
"//components/policy:policy_code_generate",
"//components/policy/core/common",
@ -144,7 +144,6 @@ source_set("unit_tests") {
"//chrome/browser/ash/guest_os",
"//chrome/browser/ash/guest_os:test_support",
"//chrome/browser/ash/guest_os/public",
"//chrome/browser/ash/guest_os/virtual_machines",
"//chrome/browser/extensions",
"//chrome/browser/profiles",
"//chrome/test:test_support",
@ -157,6 +156,7 @@ source_set("unit_tests") {
"//chromeos/ash/components/disks:test_support",
"//chromeos/ash/components/settings",
"//chromeos/ash/components/system",
"//chromeos/ash/experiences/guest_os/virtual_machines",
"//components/prefs",
"//content/test:test_support",
"//testing/gmock",

2
chrome/browser/ash/bruschetta/bruschetta_service_unittest.cc

@ -13,12 +13,12 @@
#include "chrome/browser/ash/guest_os/dbus_test_helper.h"
#include "chrome/browser/ash/guest_os/guest_os_pref_names.h"
#include "chrome/browser/ash/guest_os/public/guest_os_service.h"
#include "chrome/browser/ash/guest_os/virtual_machines/virtual_machines_util.h"
#include "chrome/test/base/testing_profile.h"
#include "chromeos/ash/components/dbus/concierge/fake_concierge_client.h"
#include "chromeos/ash/components/dbus/dlcservice/fake_dlcservice_client.h"
#include "chromeos/ash/components/dbus/vm_concierge/concierge_service.pb.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/experiences/guest_os/virtual_machines/virtual_machines_util.h"
#include "components/prefs/pref_service.h"
#include "components/prefs/scoped_user_pref_update.h"
#include "content/public/test/browser_task_environment.h"

2
chrome/browser/ash/bruschetta/bruschetta_util.cc

@ -10,9 +10,9 @@
#include "chrome/browser/ash/bruschetta/bruschetta_service_factory.h"
#include "chrome/browser/ash/guest_os/guest_id.h"
#include "chrome/browser/ash/guest_os/guest_os_pref_names.h"
#include "chrome/browser/ash/guest_os/virtual_machines/virtual_machines_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/grit/generated_resources.h"
#include "chromeos/ash/experiences/guest_os/virtual_machines/virtual_machines_util.h"
#include "components/prefs/pref_service.h"
#include "ui/base/l10n/l10n_util.h"

2
chrome/browser/ash/crostini/BUILD.gn

@ -120,7 +120,6 @@ static_library("crostini") {
"//chrome/browser/ash/crostini/ansible",
"//chrome/browser/ash/crostini/throttle",
"//chrome/browser/ash/guest_os/public",
"//chrome/browser/ash/guest_os/virtual_machines",
"//chrome/browser/ash/policy/core",
"//chrome/browser/ash/profiles",
"//chrome/browser/ash/scheduler_config",
@ -143,6 +142,7 @@ static_library("crostini") {
"//chromeos/ash/components/disks",
"//chromeos/ash/components/network",
"//chromeos/ash/components/settings",
"//chromeos/ash/experiences/guest_os/virtual_machines",
"//chromeos/constants",
"//chromeos/dbus/permission_broker",
"//chromeos/ui/base",

2
chrome/browser/ash/crostini/crostini_features.cc

@ -8,7 +8,6 @@
#include "base/feature_list.h"
#include "chrome/browser/ash/crostini/crostini_manager.h"
#include "chrome/browser/ash/crostini/crostini_pref_names.h"
#include "chrome/browser/ash/guest_os/virtual_machines/virtual_machines_util.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/browser_process.h"
@ -17,6 +16,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_features.h"
#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/experiences/guest_os/virtual_machines/virtual_machines_util.h"
#include "components/policy/proto/chrome_device_policy.pb.h"
#include "components/prefs/pref_service.h"
#include "components/user_manager/user.h"

17
chrome/browser/ash/guest_os/virtual_machines/DEPS

@ -1,17 +0,0 @@
include_rules = [
# ChromeOS should not depend on //chrome. See //docs/chromeos/code.md for
# details.
"-chrome",
# This directory is in //chrome, which violates the rule above. Allow this
# directory to #include its own files.
"+chrome/browser/ash/guest_os/virtual_machines",
# Existing dependencies within //chrome. There is an active effort to
# refactor //chrome/browser/ash to break these dependencies; see b/332804822.
# Whenever possible, avoid adding new //chrome dependencies to this list.
#
# Files residing in certain directories (e.g., //chrome/browser) are listed
# individually. Other dependencies within //chrome are listed on a per-
# directory basis. See //tools/chromeos/gen_deps.sh for details.
]

2
chrome/browser/ash/plugin_vm/BUILD.gn

@ -76,7 +76,6 @@ static_library("plugin_vm") {
"//chrome/browser:browser_process",
"//chrome/browser/ash/file_manager",
"//chrome/browser/ash/guest_os/public",
"//chrome/browser/ash/guest_os/virtual_machines",
"//chrome/browser/ash/profiles",
"//chrome/browser/profiles",
"//chrome/common:chrome_features",
@ -86,6 +85,7 @@ static_library("plugin_vm") {
"//chromeos/ash/components/dbus/dlcservice",
"//chromeos/ash/components/dbus/spaced",
"//chromeos/ash/components/install_attributes",
"//chromeos/ash/experiences/guest_os/virtual_machines",
"//chromeos/constants",
"//components/drive",
"//components/exo",

2
chrome/browser/ash/plugin_vm/plugin_vm_features.cc

@ -6,7 +6,6 @@
#include "base/feature_list.h"
#include "base/system/sys_info.h"
#include "chrome/browser/ash/guest_os/virtual_machines/virtual_machines_util.h"
#include "chrome/browser/ash/plugin_vm/plugin_vm_pref_names.h"
#include "chrome/browser/ash/plugin_vm/plugin_vm_util.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
@ -15,6 +14,7 @@
#include "chromeos/ash/components/install_attributes/install_attributes.h"
#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/experiences/guest_os/virtual_machines/virtual_machines_util.h"
#include "components/prefs/pref_service.h"
#include "components/user_manager/user.h"

3
chrome/browser/extensions/BUILD.gn

@ -1205,7 +1205,6 @@ source_set("extensions") {
"//chrome/browser/ash/fileapi",
"//chrome/browser/ash/guest_os",
"//chrome/browser/ash/guest_os/public",
"//chrome/browser/ash/guest_os/virtual_machines",
"//chrome/browser/ash/input_method",
"//chrome/browser/ash/login",
"//chrome/browser/ash/login/app_mode",
@ -1261,6 +1260,7 @@ source_set("extensions") {
"//chromeos/ash/components/system",
"//chromeos/ash/components/tether:tether",
"//chromeos/ash/components/tpm",
"//chromeos/ash/experiences/guest_os/virtual_machines",
"//chromeos/ash/services/assistant/public/cpp",
"//chromeos/ash/services/ime/public/mojom",
"//chromeos/components/remote_apps/mojom",
@ -1317,7 +1317,6 @@ source_set("extensions") {
"//chrome/browser/ash/fileapi",
"//chrome/browser/ash/guest_os",
"//chrome/browser/ash/guest_os/public",
"//chrome/browser/ash/guest_os/virtual_machines",
"//chrome/browser/ash/input_method",
"//chrome/browser/ash/login",
"//chrome/browser/ash/login/app_mode",

2
chrome/browser/extensions/api/terminal/terminal_private_api.cc

@ -39,7 +39,6 @@
#include "chrome/browser/ash/guest_os/public/guest_os_terminal_provider.h"
#include "chrome/browser/ash/guest_os/public/guest_os_terminal_provider_registry.h"
#include "chrome/browser/ash/guest_os/public/types.h"
#include "chrome/browser/ash/guest_os/virtual_machines/virtual_machines_util.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/api/terminal/startup_status.h"
#include "chrome/browser/extensions/extension_service.h"
@ -52,6 +51,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/api/terminal_private.h"
#include "chromeos/ash/components/dbus/cicerone/cicerone_client.h"
#include "chromeos/ash/experiences/guest_os/virtual_machines/virtual_machines_util.h"
#include "chromeos/process_proxy/process_proxy_registry.h"
#include "components/prefs/pref_service.h"
#include "content/public/browser/browser_context.h"

0
chrome/browser/ash/guest_os/virtual_machines/BUILD.gn → chromeos/ash/experiences/guest_os/virtual_machines/BUILD.gn

3
chromeos/ash/experiences/guest_os/virtual_machines/DEPS Normal file

@ -0,0 +1,3 @@
include_rule = [
"+chromeos/ash/components/settings"
]

2
chrome/browser/ash/guest_os/virtual_machines/virtual_machines_util.cc → chromeos/ash/experiences/guest_os/virtual_machines/virtual_machines_util.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/ash/guest_os/virtual_machines/virtual_machines_util.h"
#include "chromeos/ash/experiences/guest_os/virtual_machines/virtual_machines_util.h"
#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"

6
chrome/browser/ash/guest_os/virtual_machines/virtual_machines_util.h → chromeos/ash/experiences/guest_os/virtual_machines/virtual_machines_util.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_ASH_GUEST_OS_VIRTUAL_MACHINES_VIRTUAL_MACHINES_UTIL_H_
#define CHROME_BROWSER_ASH_GUEST_OS_VIRTUAL_MACHINES_VIRTUAL_MACHINES_UTIL_H_
#ifndef CHROMEOS_ASH_EXPERIENCES_GUEST_OS_VIRTUAL_MACHINES_VIRTUAL_MACHINES_UTIL_H_
#define CHROMEOS_ASH_EXPERIENCES_GUEST_OS_VIRTUAL_MACHINES_VIRTUAL_MACHINES_UTIL_H_
namespace virtual_machines {
@ -13,4 +13,4 @@ bool AreVirtualMachinesAllowedByPolicy();
} // namespace virtual_machines
#endif // CHROME_BROWSER_ASH_GUEST_OS_VIRTUAL_MACHINES_VIRTUAL_MACHINES_UTIL_H_
#endif // CHROMEOS_ASH_EXPERIENCES_GUEST_OS_VIRTUAL_MACHINES_VIRTUAL_MACHINES_UTIL_H_