Commit 4e80be30 authored by Vladislav Kuzkokov's avatar Vladislav Kuzkokov Committed by Commit Bot

[Printing] Fix CrOS defines

Use OS_CHROMEOS instead of CHROMEOS.

Bug: none
Change-Id: I4935e8577c03804621f21cebab99e2c59f788cf2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1713562Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Commit-Queue: Vladislav Kuzkokov <vkuzkokov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680426}
parent ce86fe28
...@@ -283,13 +283,13 @@ void PrivetNotificationService::PrivetRemoveNotification() { ...@@ -283,13 +283,13 @@ void PrivetNotificationService::PrivetRemoveNotification() {
} }
void PrivetNotificationService::Start() { void PrivetNotificationService::Start() {
#if defined(CHROMEOS) #if defined(OS_CHROMEOS)
auto* identity_manager = IdentityManagerFactory::GetForProfileIfExists( auto* identity_manager = IdentityManagerFactory::GetForProfileIfExists(
Profile::FromBrowserContext(profile_)); Profile::FromBrowserContext(profile_));
if (!identity_manager || !identity_manager->HasPrimaryAccount()) if (!identity_manager || !identity_manager->HasPrimaryAccount())
return; return;
#endif #endif // defined(OS_CHROMEOS)
enable_privet_notification_member_.Init( enable_privet_notification_member_.Init(
prefs::kLocalDiscoveryNotificationsEnabled, prefs::kLocalDiscoveryNotificationsEnabled,
......
...@@ -87,10 +87,10 @@ base::Value GetPrinterCapabilitiesOnBlockingPoolThread( ...@@ -87,10 +87,10 @@ base::Value GetPrinterCapabilitiesOnBlockingPoolThread(
#endif #endif
info.papers.insert(info.papers.end(), additional_papers.begin(), info.papers.insert(info.papers.end(), additional_papers.begin(),
additional_papers.end()); additional_papers.end());
#if defined(CHROMEOS) #if defined(OS_CHROMEOS)
if (!has_secure_protocol) if (!has_secure_protocol)
info.pin_supported = false; info.pin_supported = false;
#endif // defined(CHROMEOS) #endif // defined(OS_CHROMEOS)
return cloud_print::PrinterSemanticCapsAndDefaultsToCdd(info); return cloud_print::PrinterSemanticCapsAndDefaultsToCdd(info);
} }
......
...@@ -186,7 +186,7 @@ TEST_F(PrinterCapabilitiesTest, AdditionalPapers) { ...@@ -186,7 +186,7 @@ TEST_F(PrinterCapabilitiesTest, AdditionalPapers) {
EXPECT_EQ(600, height->GetInt()); EXPECT_EQ(600, height->GetInt());
} }
#if defined(CHROMEOS) #if defined(OS_CHROMEOS)
TEST_F(PrinterCapabilitiesTest, HasNotSecureProtocol) { TEST_F(PrinterCapabilitiesTest, HasNotSecureProtocol) {
std::string printer_name = "test_printer"; std::string printer_name = "test_printer";
PrinterBasicInfo basic_info; PrinterBasicInfo basic_info;
...@@ -219,6 +219,6 @@ TEST_F(PrinterCapabilitiesTest, HasNotSecureProtocol) { ...@@ -219,6 +219,6 @@ TEST_F(PrinterCapabilitiesTest, HasNotSecureProtocol) {
ASSERT_TRUE(pin_supported.has_value()); ASSERT_TRUE(pin_supported.has_value());
ASSERT_FALSE(pin_supported.value()); ASSERT_FALSE(pin_supported.value());
} }
#endif // defined(CHROMEOS) #endif // defined(OS_CHROMEOS)
} // namespace printing } // namespace printing
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