Commit 59937ee8 authored by Yuta Hijikata's avatar Yuta Hijikata Committed by Chromium LUCI CQ

LaCrOS: Replace defined(OS_CHROMEOS) with BUILDFLAG(IS_CHROMEOS_ASH)

The change is mostly mechanical replacing defined(OS_CHROMEOS) with
BUILDFLAG(IS_CHROMEOS_ASH) and GN variable is_chromeos with
is_chromeos_ash with some special cases (For those cases please
refer to http://go/lacros-macros).

The patch is made in preparation to switching lacros build from
target_os=linux to target_os=chromeos. This will prevent lacros from
changing behaviour after the switch.

Bug: 1052397
Change-Id: Idce96e9c4e774c1d75f86b5524863c34b3e062d8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2593851
Auto-Submit: Yuta Hijikata <ythjkt@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837606}
parent abb0ce2d
......@@ -19,6 +19,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/webui_url_constants.h"
......@@ -79,7 +80,7 @@ static const char kTypeField[] = "type";
static const char kUrlField[] = "url";
static const char kWidgetsField[] = "widgets";
#if defined(USE_AURA) && !defined(OS_CHROMEOS)
#if defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH)
static const char kWidgetIdField[] = "widgetId";
static const char kWidget[] = "widget";
#endif
......@@ -172,7 +173,7 @@ std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(Browser* browser) {
}
#endif // !defined(OS_ANDROID)
#if defined(USE_AURA) && !defined(OS_CHROMEOS)
#if defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH)
std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(
views::Widget* widget) {
std::unique_ptr<base::DictionaryValue> widget_data(
......@@ -186,7 +187,7 @@ std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(
widget_data->SetInteger(kWidgetIdField, id);
return widget_data;
}
#endif // defined(USE_AURA) && !defined(OS_CHROMEOS)
#endif // defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH)
bool ShouldHandleAccessibilityRequestCallback(const std::string& path) {
return path == kTargetsDataFile;
......@@ -289,7 +290,7 @@ void HandleAccessibilityRequestCallback(
data.Set(kBrowsersField, std::move(browser_list));
std::unique_ptr<base::ListValue> widgets_list(new base::ListValue());
#if defined(USE_AURA) && !defined(OS_CHROMEOS)
#if defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH)
if (features::IsAccessibilityTreeForViewsEnabled()) {
views::WidgetAXTreeIDMap& manager_map =
views::WidgetAXTreeIDMap::GetInstance();
......@@ -298,7 +299,7 @@ void HandleAccessibilityRequestCallback(
widgets_list->Append(BuildTargetDescriptor(widget));
}
}
#endif // defined(USE_AURA) && !defined(OS_CHROMEOS)
#endif // defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH)
data.Set(kWidgetsField, std::move(widgets_list));
std::string json_string;
......@@ -423,7 +424,7 @@ void AccessibilityUIMessageHandler::RegisterMessages() {
base::BindRepeating(&AccessibilityUIMessageHandler::RequestNativeUITree,
base::Unretained(this)));
#if defined(USE_AURA) && !defined(OS_CHROMEOS)
#if defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH)
web_ui()->RegisterMessageCallback(
"requestWidgetsTree",
base::BindRepeating(&AccessibilityUIMessageHandler::RequestWidgetsTree,
......@@ -666,7 +667,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
void AccessibilityUIMessageHandler::RequestWidgetsTree(
const base::ListValue* args) {
#if defined(USE_AURA) && !defined(OS_CHROMEOS)
#if defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH)
const base::DictionaryValue* data;
CHECK(args->GetDictionary(0, &data));
......@@ -710,7 +711,7 @@ void AccessibilityUIMessageHandler::RequestWidgetsTree(
result->SetString(kErrorField, "Window no longer exists.");
AllowJavascript();
FireWebUIListener(request_type, *(result.get()));
#endif // defined(USE_AURA) && !defined(OS_CHROMEOS)
#endif // defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH)
}
void AccessibilityUIMessageHandler::Callback(const std::string& str) {
......
......@@ -34,7 +34,7 @@ group("resources") {
]
}
if (is_chromeos) {
if (is_chromeos_ash) {
public_deps += [
":bluetooth_pairing_dialog_resources",
"chromeos:cellular_setup_resources",
......@@ -52,7 +52,7 @@ group("resources") {
public_deps += [ "webui_js_error:webui_js_error_resources" ]
}
if (!is_android && !is_chromeos) {
if (!is_android && !is_chromeos_ash) {
public_deps += [
"signin/profile_picker:profile_picker_resources",
"welcome:welcome_resources",
......
......@@ -282,7 +282,7 @@ bool CanOpenProfileOnStartup(Profile* profile) {
bool ShouldShowProfilePickerAtProcessLaunch(
ProfileManager* profile_manager,
const base::CommandLine& command_line) {
#if defined(OS_CHROMEOS)
#if BUILDFLAG(IS_CHROMEOS_ASH)
return false;
#else
// If multiple profiles get restored, do not show the picker.
......@@ -319,7 +319,7 @@ bool ShouldShowProfilePickerAtProcessLaunch(
}
#endif // defined(OS_WIN)
return ProfilePicker::ShouldShowAtLaunch();
#endif // !defined(OS_CHROMEOS)
#endif // !BUILDFLAG(IS_CHROMEOS_ASH)
}
void ShowUserManager(bool is_process_startup) {
......@@ -1191,7 +1191,7 @@ std::vector<GURL> GetURLsFromCommandLine(const base::CommandLine& command_line,
const GURL settings_url = GURL(chrome::kChromeUISettingsURL);
bool url_points_to_an_approved_settings_page = false;
#if defined(OS_CHROMEOS)
#if BUILDFLAG(IS_CHROMEOS_ASH)
// In ChromeOS, allow any settings page to be specified on the command line.
url_points_to_an_approved_settings_page =
url.GetOrigin() == settings_url.GetOrigin();
......@@ -1210,7 +1210,7 @@ std::vector<GURL> GetURLsFromCommandLine(const base::CommandLine& command_line,
url_points_to_an_approved_settings_page ||
url == reset_settings_url_with_cct_hash;
#endif // defined(OS_WIN)
#endif // defined(OS_CHROMEOS)
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
ChildProcessSecurityPolicy* policy =
ChildProcessSecurityPolicy::GetInstance();
......@@ -1264,7 +1264,7 @@ Profile* GetStartupProfile(const base::FilePath& user_data_dir,
const base::FilePath& cur_dir,
const base::CommandLine& command_line) {
ProfileManager* profile_manager = g_browser_process->profile_manager();
#if !defined(OS_CHROMEOS)
#if !BUILDFLAG(IS_CHROMEOS_ASH)
if (ShouldShowProfilePickerAtProcessLaunch(profile_manager, command_line)) {
// Open the picker only if no URLs have been provided to launch Chrome. If
// URLs are provided, open them in the last profile, instead.
......@@ -1285,7 +1285,7 @@ Profile* GetStartupProfile(const base::FilePath& user_data_dir,
return guest_profile;
}
}
#endif // !defined(OS_CHROMEOS)
#endif // !BUILDFLAG(IS_CHROMEOS_ASH)
base::FilePath profile_path =
GetStartupProfilePath(user_data_dir, command_line);
......
......@@ -8,6 +8,7 @@
#include <memory>
#include "base/macros.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/ui/views/frame/system_menu_model_delegate.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
......
......@@ -838,7 +838,9 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewViewsUIATest, AccessibleOmnibox) {
// Looks like the same problem as in the SelectAllOnClick().
// Tracked in: https://crbug.com/915591
// Test is also flaky on Linux: https://crbug.com/1157250
#if defined(OS_MAC) || defined(OS_LINUX)
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
#if defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#define MAYBE_HandleExternalProtocolURLs DISABLED_HandleExternalProtocolURLs
#else
#define MAYBE_HandleExternalProtocolURLs HandleExternalProtocolURLs
......
......@@ -5,6 +5,7 @@
#include "chrome/browser/ui/views/web_apps/frame_toolbar/web_app_navigation_button_container.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/app/vector_icons/vector_icons.h"
#include "chrome/browser/ui/browser.h"
......
......@@ -10,6 +10,7 @@
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/web_share_target/target_util.h"
#include "components/services/app_service/public/cpp/share_target.h"
......
......@@ -5,6 +5,7 @@
#ifndef CHROME_BROWSER_UI_WEB_APPLICATIONS_WEB_APP_MENU_MODEL_H_
#define CHROME_BROWSER_UI_WEB_APPLICATIONS_WEB_APP_MENU_MODEL_H_
#include "build/chromeos_buildflags.h"
#include "chrome/browser/ui/toolbar/app_menu_model.h"
class AssignToDesksMenuModel;
......
......@@ -5,6 +5,7 @@
#include "chrome/browser/ui/webui/chrome_untrusted_web_ui_controller_factory.h"
#include "base/no_destructor.h"
#include "build/chromeos_buildflags.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h"
#include "content/public/browser/web_ui_controller.h"
......@@ -23,7 +24,7 @@ namespace {
// constructing from a vector is O(n log n).
WebUIConfigList CreateConfigs() {
WebUIConfigList config_list;
#if defined(OS_CHROMEOS) && !defined(OFFICIAL_BUILD)
#if BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OFFICIAL_BUILD)
auto register_config =
[&config_list](std::unique_ptr<ui::WebUIConfig> config) {
DCHECK_EQ(config->scheme(), content::kChromeUIUntrustedScheme);
......
......@@ -313,7 +313,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
{"selectButton", IDS_PRINT_PREVIEW_BUTTON_SELECT},
{"seeMore", IDS_PRINT_PREVIEW_SEE_MORE},
{"seeMoreDestinationsLabel", IDS_PRINT_PREVIEW_SEE_MORE_DESTINATIONS_LABEL},
#if defined(OS_CHROMEOS)
#if BUILDFLAG(IS_CHROMEOS_ASH)
{"serverSearchBoxPlaceholder",
IDS_PRINT_PREVIEW_SERVER_SEARCH_BOX_PLACEHOLDER},
#endif
......
......@@ -5,6 +5,7 @@
#include "chrome/browser/web_applications/components/external_app_install_features.h"
#include "base/feature_list.h"
#include "build/chromeos_buildflags.h"
namespace web_app {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment