Skip to content

GitLab

T
tangled
Commit b9c4af6a authored by jamescook's avatar jamescook Committed by Commit bot
Browse files
Options

chromeos: Remove OS ifdefs from ash/common/system/tray 

Ash is only compiled on Chrome OS so it doesn't need OS_WIN or OS_CHROMEOS
ifdefs.

BUG=666773,665960
TEST=ash_unittests
R=msw@chromium.org

Review-Url: https://codereview.chromium.org/2576133002
Cr-Commit-Position: refs/heads/master@{#438706}
parent 9ac64ee8
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 175 deletions
ash/common/system/tray/label_tray_view.cc
View file @ b9c4af6a
......@@ -25,7 +25,6 @@ namespace {
// TODO(tdanderson): Remove this once material design is enabled by
// default. See crbug.com/614453.
const gfx::VectorIcon& ResourceIdToVectorIcon(int resource_id) {
#if defined(OS_CHROMEOS)
switch (resource_id) {
case IDR_AURA_UBER_TRAY_ENTERPRISE:
return kSystemMenuBusinessIcon;
......@@ -39,8 +38,6 @@ const gfx::VectorIcon& ResourceIdToVectorIcon(int resource_id) {
NOTREACHED();
break;
}
#endif // defined(OS_CHROMEOS)
return gfx::kNoneIcon;
}
......
ash/common/system/tray/system_tray.cc
View file @ b9c4af6a
......@@ -14,8 +14,27 @@
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/common/system/chromeos/audio/tray_audio.h"
#include "ash/common/system/chromeos/bluetooth/tray_bluetooth.h"
#include "ash/common/system/chromeos/brightness/tray_brightness.h"
#include "ash/common/system/chromeos/cast/tray_cast.h"
#include "ash/common/system/chromeos/enterprise/tray_enterprise.h"
#include "ash/common/system/chromeos/media_security/multi_profile_media_tray_item.h"
#include "ash/common/system/chromeos/network/tray_network.h"
#include "ash/common/system/chromeos/network/tray_sms.h"
#include "ash/common/system/chromeos/network/tray_vpn.h"
#include "ash/common/system/chromeos/power/power_status.h"
#include "ash/common/system/chromeos/power/tray_power.h"
#include "ash/common/system/chromeos/screen_security/screen_capture_tray_item.h"
#include "ash/common/system/chromeos/screen_security/screen_share_tray_item.h"
#include "ash/common/system/chromeos/session/tray_session_length_limit.h"
#include "ash/common/system/chromeos/settings/tray_settings.h"
#include "ash/common/system/chromeos/supervised/tray_supervised_user.h"
#include "ash/common/system/chromeos/tray_caps_lock.h"
#include "ash/common/system/chromeos/tray_tracing.h"
#include "ash/common/system/date/tray_date.h"
#include "ash/common/system/date/tray_system_info.h"
#include "ash/common/system/ime/tray_ime_chromeos.h"
#include "ash/common/system/tiles/tray_tiles.h"
#include "ash/common/system/tray/system_tray_controller.h"
#include "ash/common/system/tray/system_tray_delegate.h"
......@@ -36,7 +55,6 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "base/logging.h"
#include "base/metrics/histogram.h"
#include "base/strings/utf_string_conversions.h"
#include "base/timer/timer.h"
#include "grit/ash_strings.h"
#include "ui/base/accelerators/accelerator.h"
......@@ -47,35 +65,13 @@
#include "ui/events/event_constants.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/skia_util.h"
#include "ui/message_center/message_center.h"
#include "ui/message_center/message_center_style.h"
#include "ui/views/border.h"
#include "ui/views/controls/label.h"
#include "ui/views/view.h"
#include "ui/views/widget/widget.h"
#if defined(OS_CHROMEOS)
#include "ash/common/system/chromeos/audio/tray_audio.h"
#include "ash/common/system/chromeos/bluetooth/tray_bluetooth.h"
#include "ash/common/system/chromeos/brightness/tray_brightness.h"
#include "ash/common/system/chromeos/cast/tray_cast.h"
#include "ash/common/system/chromeos/enterprise/tray_enterprise.h"
#include "ash/common/system/chromeos/media_security/multi_profile_media_tray_item.h"
#include "ash/common/system/chromeos/network/tray_network.h"
#include "ash/common/system/chromeos/network/tray_sms.h"
#include "ash/common/system/chromeos/network/tray_vpn.h"
#include "ash/common/system/chromeos/power/power_status.h"
#include "ash/common/system/chromeos/power/tray_power.h"
#include "ash/common/system/chromeos/screen_security/screen_capture_tray_item.h"
#include "ash/common/system/chromeos/screen_security/screen_share_tray_item.h"
#include "ash/common/system/chromeos/session/tray_session_length_limit.h"
#include "ash/common/system/chromeos/settings/tray_settings.h"
#include "ash/common/system/chromeos/supervised/tray_supervised_user.h"
#include "ash/common/system/chromeos/tray_caps_lock.h"
#include "ash/common/system/chromeos/tray_tracing.h"
#include "ash/common/system/ime/tray_ime_chromeos.h"
#include "ui/message_center/message_center.h"
#endif
using views::TrayBubbleView;
namespace ash {
......@@ -258,7 +254,7 @@ void SystemTray::Shutdown() {
void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
const bool use_md = MaterialDesignController::IsSystemTrayMenuMaterial();
#if !defined(OS_WIN)
// Create user items for each possible user.
int maximum_user_profiles = WmShell::Get()
->GetSessionStateDelegate()
......@@ -276,14 +272,12 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
// menu if more than one user is logged in.
AddTrayItem(new TrayUserSeparator(this));
}
#endif
tray_accessibility_ = new TrayAccessibility(this);
if (!use_md)
tray_date_ = new TrayDate(this);
tray_update_ = new TrayUpdate(this);
#if defined(OS_CHROMEOS)
AddTrayItem(new TraySessionLengthLimit(this));
AddTrayItem(new TrayEnterprise(this));
AddTrayItem(new TraySupervisedUser(this));
......@@ -321,18 +315,11 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
AddTrayItem(tray_tiles_);
tray_system_info_ = new TraySystemInfo(this);
AddTrayItem(tray_system_info_);
// Leading padding.
AddTrayItem(new PaddingTrayItem());
} else {
AddTrayItem(tray_date_);
}
#elif defined(OS_WIN)
AddTrayItem(tray_accessibility_);
AddTrayItem(tray_update_);
if (!use_md)
AddTrayItem(tray_date_);
#endif
// Leading padding.
if (use_md)
AddTrayItem(new PaddingTrayItem());
}
void SystemTray::AddTrayItem(SystemTrayItem* item) {
......@@ -527,10 +514,7 @@ void SystemTray::DestroyNotificationBubble() {
base::string16 SystemTray::GetAccessibleNameForTray() {
base::string16 time = GetAccessibleTimeString(base::Time::Now());
base::string16 battery = base::ASCIIToUTF16("");
#if defined(OS_CHROMEOS)
battery = PowerStatus::Get()->GetAccessibleNameString(false);
#endif
base::string16 battery = PowerStatus::Get()->GetAccessibleNameString(false);
return l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_ACCESSIBLE_DESCRIPTION,
time, battery);
}
......
ash/common/system/tray/system_tray_notifier.cc
View file @ b9c4af6a
......@@ -5,11 +5,6 @@
#include "ash/common/system/tray/system_tray_notifier.h"
#include "ash/common/system/accessibility_observer.h"
#include "ash/common/system/date/clock_observer.h"
#include "ash/common/system/ime/ime_observer.h"
#include "ash/common/system/user/user_observer.h"
#if defined(OS_CHROMEOS)
#include "ash/common/system/chromeos/bluetooth/bluetooth_observer.h"
#include "ash/common/system/chromeos/enterprise/enterprise_domain_observer.h"
#include "ash/common/system/chromeos/network/network_observer.h"
......@@ -21,7 +16,9 @@
#include "ash/common/system/chromeos/session/session_length_limit_observer.h"
#include "ash/common/system/chromeos/tray_tracing.h"
#include "ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h"
#endif
#include "ash/common/system/date/clock_observer.h"
#include "ash/common/system/ime/ime_observer.h"
#include "ash/common/system/user/user_observer.h"
namespace ash {
......@@ -45,6 +42,24 @@ void SystemTrayNotifier::NotifyAccessibilityModeChanged(
observer.OnAccessibilityModeChanged(notify);
}
void SystemTrayNotifier::AddBluetoothObserver(BluetoothObserver* observer) {
bluetooth_observers_.AddObserver(observer);
}
void SystemTrayNotifier::RemoveBluetoothObserver(BluetoothObserver* observer) {
bluetooth_observers_.RemoveObserver(observer);
}
void SystemTrayNotifier::NotifyRefreshBluetooth() {
for (auto& observer : bluetooth_observers_)
observer.OnBluetoothRefresh();
}
void SystemTrayNotifier::NotifyBluetoothDiscoveringChanged() {
for (auto& observer : bluetooth_observers_)
observer.OnBluetoothDiscoveringChanged();
}
void SystemTrayNotifier::AddClockObserver(ClockObserver* observer) {
clock_observers_.AddObserver(observer);
}
......@@ -73,6 +88,21 @@ void SystemTrayNotifier::NotifySystemClockCanSetTimeChanged(bool can_set_time) {
observer.OnSystemClockCanSetTimeChanged(can_set_time);
}
void SystemTrayNotifier::AddEnterpriseDomainObserver(
EnterpriseDomainObserver* observer) {
enterprise_domain_observers_.AddObserver(observer);
}
void SystemTrayNotifier::RemoveEnterpriseDomainObserver(
EnterpriseDomainObserver* observer) {
enterprise_domain_observers_.RemoveObserver(observer);
}
void SystemTrayNotifier::NotifyEnterpriseDomainChanged() {
for (auto& observer : enterprise_domain_observers_)
observer.OnEnterpriseDomainChanged();
}
void SystemTrayNotifier::AddIMEObserver(IMEObserver* observer) {
ime_observers_.AddObserver(observer);
}
......@@ -91,61 +121,6 @@ void SystemTrayNotifier::NotifyRefreshIMEMenu(bool is_active) {
observer.OnIMEMenuActivationChanged(is_active);
}
void SystemTrayNotifier::AddUserObserver(UserObserver* observer) {
user_observers_.AddObserver(observer);
}
void SystemTrayNotifier::RemoveUserObserver(UserObserver* observer) {
user_observers_.RemoveObserver(observer);
}
void SystemTrayNotifier::NotifyUserUpdate() {
for (auto& observer : user_observers_)
observer.OnUserUpdate();
}
void SystemTrayNotifier::NotifyUserAddedToSession() {
for (auto& observer : user_observers_)
observer.OnUserAddedToSession();
}
////////////////////////////////////////////////////////////////////////////////
#if defined(OS_CHROMEOS)
void SystemTrayNotifier::AddBluetoothObserver(BluetoothObserver* observer) {
bluetooth_observers_.AddObserver(observer);
}
void SystemTrayNotifier::RemoveBluetoothObserver(BluetoothObserver* observer) {
bluetooth_observers_.RemoveObserver(observer);
}
void SystemTrayNotifier::NotifyRefreshBluetooth() {
for (auto& observer : bluetooth_observers_)
observer.OnBluetoothRefresh();
}
void SystemTrayNotifier::NotifyBluetoothDiscoveringChanged() {
for (auto& observer : bluetooth_observers_)
observer.OnBluetoothDiscoveringChanged();
}
void SystemTrayNotifier::AddEnterpriseDomainObserver(
EnterpriseDomainObserver* observer) {
enterprise_domain_observers_.AddObserver(observer);
}
void SystemTrayNotifier::RemoveEnterpriseDomainObserver(
EnterpriseDomainObserver* observer) {
enterprise_domain_observers_.RemoveObserver(observer);
}
void SystemTrayNotifier::NotifyEnterpriseDomainChanged() {
for (auto& observer : enterprise_domain_observers_)
observer.OnEnterpriseDomainChanged();
}
void SystemTrayNotifier::AddLastWindowClosedObserver(
LastWindowClosedObserver* observer) {
last_window_closed_observers_.AddObserver(observer);
......@@ -287,6 +262,24 @@ void SystemTrayNotifier::NotifyTracingModeChanged(bool value) {
observer.OnTracingModeChanged(value);
}
void SystemTrayNotifier::AddUserObserver(UserObserver* observer) {
user_observers_.AddObserver(observer);
}
void SystemTrayNotifier::RemoveUserObserver(UserObserver* observer) {
user_observers_.RemoveObserver(observer);
}
void SystemTrayNotifier::NotifyUserUpdate() {
for (auto& observer : user_observers_)
observer.OnUserUpdate();
}
void SystemTrayNotifier::NotifyUserAddedToSession() {
for (auto& observer : user_observers_)
observer.OnUserAddedToSession();
}
void SystemTrayNotifier::AddVirtualKeyboardObserver(
VirtualKeyboardObserver* observer) {
virtual_keyboard_observers_.AddObserver(observer);
......@@ -303,6 +296,4 @@ void SystemTrayNotifier::NotifyVirtualKeyboardSuppressionChanged(
observer.OnKeyboardSuppressionChanged(suppressed);
}
#endif // defined(OS_CHROMEOS)
} // namespace ash
ash/common/system/tray/system_tray_notifier.h
View file @ b9c4af6a
......@@ -11,22 +11,16 @@
#include "ash/common/accessibility_types.h"
#include "base/macros.h"
#include "base/observer_list.h"
#if defined(OS_CHROMEOS)
#include "base/strings/string16.h"
#include "base/time/time.h"
#endif
namespace ash {
class AccessibilityObserver;
class ClockObserver;
class IMEObserver;
class UserObserver;
#if defined(OS_CHROMEOS)
class BluetoothObserver;
class ClockObserver;
class EnterpriseDomainObserver;
class IMEObserver;
class LastWindowClosedObserver;
class LogoutButtonObserver;
class NetworkObserver;
......@@ -35,8 +29,8 @@ class ScreenCaptureObserver;
class ScreenShareObserver;
class SessionLengthLimitObserver;
class TracingObserver;
class UserObserver;
class VirtualKeyboardObserver;
#endif
namespace mojom {
enum class UpdateSeverity;
......@@ -54,6 +48,12 @@ class ASH_EXPORT SystemTrayNotifier {
void NotifyAccessibilityModeChanged(
AccessibilityNotificationVisibility notify);
// Bluetooth.
void AddBluetoothObserver(BluetoothObserver* observer);
void RemoveBluetoothObserver(BluetoothObserver* observer);
void NotifyRefreshBluetooth();
void NotifyBluetoothDiscoveringChanged();
// Date and time.
void AddClockObserver(ClockObserver* observer);
void RemoveClockObserver(ClockObserver* observer);
......@@ -62,30 +62,17 @@ class ASH_EXPORT SystemTrayNotifier {
void NotifySystemClockTimeUpdated();
void NotifySystemClockCanSetTimeChanged(bool can_set_time);
// Enterprise domain.
void AddEnterpriseDomainObserver(EnterpriseDomainObserver* observer);
void RemoveEnterpriseDomainObserver(EnterpriseDomainObserver* observer);
void NotifyEnterpriseDomainChanged();
// Input methods.
void AddIMEObserver(IMEObserver* observer);
void RemoveIMEObserver(IMEObserver* observer);
void NotifyRefreshIME();
void NotifyRefreshIMEMenu(bool is_active);
// User.
void AddUserObserver(UserObserver* observer);
void RemoveUserObserver(UserObserver* observer);
void NotifyUserUpdate();
void NotifyUserAddedToSession();
#if defined(OS_CHROMEOS)
// Bluetooth.
void AddBluetoothObserver(BluetoothObserver* observer);
void RemoveBluetoothObserver(BluetoothObserver* observer);
void NotifyRefreshBluetooth();
void NotifyBluetoothDiscoveringChanged();
// Enterprise domain.
void AddEnterpriseDomainObserver(EnterpriseDomainObserver* observer);
void RemoveEnterpriseDomainObserver(EnterpriseDomainObserver* observer);
void NotifyEnterpriseDomainChanged();
// Last window closed.
void AddLastWindowClosedObserver(LastWindowClosedObserver* observer);
void RemoveLastWindowClosedObserver(LastWindowClosedObserver* observer);
......@@ -134,21 +121,23 @@ class ASH_EXPORT SystemTrayNotifier {
void RemoveTracingObserver(TracingObserver* observer);
void NotifyTracingModeChanged(bool value);
// User.
void AddUserObserver(UserObserver* observer);
void RemoveUserObserver(UserObserver* observer);
void NotifyUserUpdate();
void NotifyUserAddedToSession();
// Virtual keyboard.
void AddVirtualKeyboardObserver(VirtualKeyboardObserver* observer);
void RemoveVirtualKeyboardObserver(VirtualKeyboardObserver* observer);
void NotifyVirtualKeyboardSuppressionChanged(bool suppressed);
#endif
private:
base::ObserverList<AccessibilityObserver> accessibility_observers_;
base::ObserverList<ClockObserver> clock_observers_;
base::ObserverList<IMEObserver> ime_observers_;
base::ObserverList<UserObserver> user_observers_;
#if defined(OS_CHROMEOS)
base::ObserverList<BluetoothObserver> bluetooth_observers_;
base::ObserverList<ClockObserver> clock_observers_;
base::ObserverList<EnterpriseDomainObserver> enterprise_domain_observers_;
base::ObserverList<IMEObserver> ime_observers_;
base::ObserverList<LastWindowClosedObserver> last_window_closed_observers_;
base::ObserverList<LogoutButtonObserver> logout_button_observers_;
base::ObserverList<NetworkObserver> network_observers_;
......@@ -159,8 +148,8 @@ class ASH_EXPORT SystemTrayNotifier {
base::ObserverList<SessionLengthLimitObserver>
session_length_limit_observers_;
base::ObserverList<TracingObserver> tracing_observers_;
base::ObserverList<UserObserver> user_observers_;
base::ObserverList<VirtualKeyboardObserver> virtual_keyboard_observers_;
#endif
DISALLOW_COPY_AND_ASSIGN(SystemTrayNotifier);
};
......
ash/common/system/tray/system_tray_unittest.cc
View file @ b9c4af6a
......@@ -35,10 +35,6 @@
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_delegate.h"
#if defined(OS_WIN)
#include "base/win/windows_version.h"
#endif
namespace ash {
namespace test {
......@@ -121,15 +117,9 @@ TEST_F(SystemTrayTest, NotRecordedtemsAreNotRecorded) {
RunAllPendingInMessageLoop();
}
// TODO(bruthig): Re-enable. See https://crbug.com/665960.
#if defined(OS_WIN)
#define MAYBE_NullDefaultViewIsNotRecorded DISABLED_NullDefaultViewIsNotRecorded
#else
#define MAYBE_NullDefaultViewIsNotRecorded NullDefaultViewIsNotRecorded
#endif
// Verifies null default views are not recorded in the
// "Ash.SystemMenu.DefaultView.VisibleItems" histogram.
TEST_F(SystemTrayTest, MAYBE_NullDefaultViewIsNotRecorded) {
TEST_F(SystemTrayTest, NullDefaultViewIsNotRecorded) {
SystemTray* tray = GetPrimarySystemTray();
ASSERT_TRUE(tray->GetWidget());
......@@ -391,13 +381,8 @@ TEST_F(SystemTrayTest, SystemTrayNotifications) {
ASSERT_TRUE(test_item->notification_view() != NULL);
}
// Test is flaky on Win7 and Cros (crbug.com/637978).
#if defined(OS_CHROMEOS) || defined(OS_WIN)
#define MAYBE_BubbleCreationTypesTest DISABLED_BubbleCreationTypesTest
#else
#define MAYBE_BubbleCreationTypesTest BubbleCreationTypesTest
#endif
TEST_F(SystemTrayTest, MAYBE_BubbleCreationTypesTest) {
// Test is flaky. http://crbug.com/637978
TEST_F(SystemTrayTest, DISABLED_BubbleCreationTypesTest) {
SystemTray* tray = GetPrimarySystemTray();
ASSERT_TRUE(tray->GetWidget());
......@@ -523,13 +508,7 @@ TEST_F(SystemTrayTest, PersistentBubble) {
EXPECT_TRUE(tray->HasSystemBubble());
}
#if defined(OS_CHROMEOS)
// Accessibility/Settings tray items are available only on cros.
#define MAYBE_WithSystemModal WithSystemModal
#else
#define MAYBE_WithSystemModal DISABLED_WithSystemModal
#endif
TEST_F(SystemTrayTest, MAYBE_WithSystemModal) {
TEST_F(SystemTrayTest, WithSystemModal) {
// Check if the accessibility item is created even with system modal dialog.
WmShell::Get()->accessibility_delegate()->SetVirtualKeyboardEnabled(true);
std::unique_ptr<views::Widget> widget(CreateTestWidget(
......@@ -589,7 +568,6 @@ TEST_F(SystemTrayTest, SetVisibleDuringHideAnimation) {
EXPECT_EQ(1.0f, tray->layer()->GetTargetOpacity());
}
#if defined(OS_CHROMEOS)
// Tests that touch on an item in the system bubble triggers it to become
// active.
TEST_F(SystemTrayTest, TrayPopupItemContainerTouchFeedback) {
......@@ -664,7 +642,6 @@ TEST_F(SystemTrayTest, SystemTrayHeightWithBubble) {
EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test());
}
#endif // OS_CHROMEOS
} // namespace test
} // namespace ash
ash/common/system/tray/tray_image_item.cc
View file @ b9c4af6a
......@@ -29,18 +29,16 @@ const gfx::VectorIcon& ResourceIdToVectorIcon(int resource_id) {
switch (resource_id) {
case IDR_AURA_UBER_TRAY_ACCESSIBILITY:
return kSystemTrayAccessibilityIcon;
case IDR_AURA_UBER_TRAY_UPDATE:
return kSystemTrayUpdateIcon;
case IDR_AURA_UBER_TRAY_VOLUME_MUTE:
return kSystemTrayVolumeMuteIcon;
#if defined(OS_CHROMEOS)
case IDR_AURA_UBER_TRAY_AUTO_ROTATION_LOCKED:
return kSystemTrayRotationLockLockedIcon;
case IDR_AURA_UBER_TRAY_CAPS_LOCK:
return kSystemTrayCapsLockIcon;
case IDR_AURA_UBER_TRAY_TRACING:
return kSystemTrayTracingIcon;
#endif
case IDR_AURA_UBER_TRAY_UPDATE:
return kSystemTrayUpdateIcon;
case IDR_AURA_UBER_TRAY_VOLUME_MUTE:
return kSystemTrayVolumeMuteIcon;
default:
NOTREACHED();
break;
......
ash/common/system/tray/tray_notification_view.cc
View file @ b9c4af6a
......@@ -29,10 +29,8 @@ const gfx::VectorIcon& ResourceIdToVectorIcon(int resource_id) {
switch (resource_id) {
case IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK:
return kSystemMenuAccessibilityIcon;
#if defined(OS_CHROMEOS)
case IDR_AURA_UBER_TRAY_SMS:
return kSystemMenuSmsIcon;
#endif
default:
NOTREACHED();
break;
......
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