Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Unified Diff: ash/system/tray/system_tray.cc

Issue 2091933002: mash: Convert TrayBackgroundView to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tweak Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index 963618f7c695dde730703493c5087a5f45c73fc6..514796a6aa3dac0927dab64f7b6ce33110d78eed 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -12,6 +12,7 @@
#include "ash/common/system/date/tray_date.h"
#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/system/tray/system_tray_item.h"
+#include "ash/common/system/tray/tray_bubble_wrapper.h"
#include "ash/common/system/tray/tray_constants.h"
#include "ash/common/system/tray_accessibility.h"
#include "ash/common/system/update/tray_update.h"
@@ -23,7 +24,6 @@
#include "ash/shell.h"
#include "ash/system/cast/tray_cast.h"
#include "ash/system/status_area_widget.h"
-#include "ash/system/tray/tray_bubble_wrapper.h"
#include "ash/system/user/login_status.h"
#include "ash/system/user/tray_user.h"
#include "ash/system/user/tray_user_separator.h"
@@ -131,7 +131,8 @@ class SystemBubbleWrapper {
// SystemTray
SystemTray::SystemTray(StatusAreaWidget* status_area_widget)
- : TrayBackgroundView(status_area_widget),
+ : TrayBackgroundView(status_area_widget->wm_shelf()),
+ status_area_widget_(status_area_widget),
items_(),
detailed_item_(nullptr),
default_bubble_height_(0),
@@ -143,6 +144,7 @@ SystemTray::SystemTray(StatusAreaWidget* status_area_widget)
tray_update_(nullptr),
screen_capture_tray_item_(nullptr),
screen_share_tray_item_(nullptr) {
+ DCHECK(status_area_widget_);
SetContentsBackground();
}
@@ -532,7 +534,7 @@ void SystemTray::ShowItems(const std::vector<SystemTrayItem*>& items,
UpdateNotificationBubble(); // State changed, re-create notifications.
if (!notification_bubble_)
UpdateWebNotifications();
- GetShelf()->UpdateAutoHideState();
+ shelf()->UpdateAutoHideState();
// When we show the system menu in our alternate shelf layout, we need to
// tint the background.
@@ -603,7 +605,7 @@ void SystemTray::UpdateWebNotifications() {
height =
std::max(0, work_area.height() - bubble_view->GetBoundsInScreen().y());
}
- status_area_widget()->web_notification_tray()->SetSystemTrayHeight(height);
+ status_area_widget_->web_notification_tray()->SetSystemTrayHeight(height);
}
base::string16 SystemTray::GetAccessibleTimeString(
@@ -652,7 +654,7 @@ void SystemTray::HideBubbleWithView(const TrayBubbleView* bubble_view) {
if (system_bubble_.get() && bubble_view == system_bubble_->bubble_view()) {
DestroySystemBubble();
UpdateNotificationBubble(); // State changed, re-create notifications.
- GetShelf()->UpdateAutoHideState();
+ shelf()->UpdateAutoHideState();
} else if (notification_bubble_.get() &&
bubble_view == notification_bubble_->bubble_view()) {
DestroyNotificationBubble();

Powered by Google App Engine
This is Rietveld 408576698