chromium/src
0
Fork 0
Code Activity

Remove IS_CHROMEOS_ASH from //components/*

Browse Source 
This cleans up the following subdirectories: sessions,
soda, storage_monitor, supervised_user, sync_preferences,
system_media_controls, translate, trusted_vault,
unified_consent, update_client, user_manager,
vector_icons, version_ui, web_resource

1) Removed IS_CHROMEOS_LACROS usages and code it guarded
2) Renamed IS_CHROMEOS_ASH to IS_CHROMEOS
3) Removed chromeos_buildflags.h includes
4) Cleaned up *.gn files from IS_CHROMEOS_*.

Bug: 375523816, 373972275, 373971535
Change-Id: I973920d2078526bede68a84dbea53029d202c22d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6097194
Reviewed-by: Georg Neis <neis@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Maksim Sisov <msisov@igalia.com>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1397771}
This commit is contained in:
Maksim Sisov
2024-12-18 00:34:42 -08:00
committed by Chromium LUCI CQ
parent cf38e29997
commit 764f01d25d
58 changed files with 124 additions and 556 deletions
components
sessions
BUILD.gn
core
session_types.htab_restore_service_impl.cc
soda
BUILD.gnsoda_features.ccsoda_installer.ccsoda_util.cc
storage_monitor
BUILD.gnmtab_watcher_linux.hstorage_monitor.hstorage_monitor_chromeos.hstorage_monitor_linux.htest_storage_monitor.cctest_storage_monitor.h
supervised_user
core
browser
child_account_service.cclist_family_members_service_unittest.ccsupervised_user_url_filter.h
sync_preferences
BUILD.gncommon_syncable_prefs_database.ccdual_layer_user_pref_store.ccdual_layer_user_pref_store_unittest.ccpref_model_associator.ccpref_model_associator_unittest.ccpref_service_syncable.ccpref_service_syncable.hpref_service_syncable_unittest.ccsyncable_prefs_database.ccsyncable_prefs_database.h
system_media_controls
linux
buildflags
buildflags.gni
translate
core
browser
BUILD.gnmock_translate_client.cctranslate_infobar_delegate_unittest.cctranslate_manager_unittest.cctranslate_prefs.cctranslate_prefs_unittest.cctranslate_ui_delegate.cctranslate_ui_delegate_unittest.cctranslate_ui_languages_manager.cc
trusted_vault
BUILD.gn
test
fake_crosapi_trusted_vault_backend.ccfake_crosapi_trusted_vault_backend.hfake_crosapi_trusted_vault_backend_service.ccfake_crosapi_trusted_vault_backend_service.h
unified_consent
BUILD.gnpref_names.ccpref_names.hunified_consent_service.ccunified_consent_service.hunified_consent_service_unittest.cc
update_client
BUILD.gnupdate_query_params.cc
user_manager
BUILD.gn
vector_icons
BUILD.gn
version_ui
BUILD.gnversion_ui_constants.ccversion_ui_constants.h
web_resource
BUILD.gneula_accepted_notifier.cc

1
components/sessions/BUILD.gn

@ -136,7 +136,6 @@ source_set("shared") {
public_deps = [
":session_id",
"//build:chromeos_buildflags",
"//components/keyed_service/core",
"//skia",
]

3
components/sessions/core/session_types.h

@ -14,7 +14,6 @@
#include "base/time/time.h"
#include "base/token.h"
#include "build/chromeos_buildflags.h"
#include "components/sessions/core/serialized_navigation_entry.h"
#include "components/sessions/core/serialized_user_agent_override.h"
#include "components/sessions/core/session_id.h"
@ -156,7 +155,7 @@ struct SESSIONS_EXPORT SessionWindow {
TYPE_APP = 2,
TYPE_DEVTOOLS = 3,
TYPE_APP_POPUP = 4,
#if BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS)
TYPE_CUSTOM_TAB = 5,
#endif
};

2
components/sessions/core/tab_restore_service_impl.cc

@ -253,7 +253,7 @@ bool DeserializeWindowType(int type_int,
case sessions::SessionWindow::TYPE_APP:
case sessions::SessionWindow::TYPE_DEVTOOLS:
case sessions::SessionWindow::TYPE_APP_POPUP:
#if BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS)
case sessions::SessionWindow::TYPE_CUSTOM_TAB:
#endif
*type = static_cast<sessions::SessionWindow::WindowType>(type_int);