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

Side by Side Diff: ash/system/chromeos/session/tray_session_length_limit.cc

Issue 262973004: Move session length timer into tray bubble. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Steven's comments. Created 6 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/system/chromeos/session/tray_session_length_limit.h" 5 #include "ash/system/chromeos/session/tray_session_length_limit.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/shelf/shelf_types.h"
10 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/system/chromeos/label_tray_view.h"
11 #include "ash/system/system_notifier.h" 11 #include "ash/system/system_notifier.h"
12 #include "ash/system/tray/system_tray.h" 12 #include "ash/system/tray/system_tray.h"
13 #include "ash/system/tray/system_tray_delegate.h" 13 #include "ash/system/tray/system_tray_delegate.h"
14 #include "ash/system/tray/system_tray_notifier.h" 14 #include "ash/system/tray/system_tray_notifier.h"
15 #include "ash/system/tray/tray_constants.h"
16 #include "ash/system/tray/tray_utils.h"
17 #include "base/location.h"
18 #include "base/logging.h" 15 #include "base/logging.h"
19 #include "base/strings/string16.h"
20 #include "base/strings/string_number_conversions.h"
21 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
22 #include "grit/ash_resources.h" 17 #include "grit/ash_resources.h"
23 #include "grit/ash_strings.h" 18 #include "grit/ash_strings.h"
24 #include "third_party/skia/include/core/SkColor.h"
25 #include "ui/base/l10n/l10n_util.h" 19 #include "ui/base/l10n/l10n_util.h"
26 #include "ui/base/l10n/time_format.h" 20 #include "ui/base/l10n/time_format.h"
27 #include "ui/base/resource/resource_bundle.h" 21 #include "ui/base/resource/resource_bundle.h"
28 #include "ui/gfx/font_list.h"
29 #include "ui/message_center/message_center.h" 22 #include "ui/message_center/message_center.h"
30 #include "ui/message_center/notification.h" 23 #include "ui/message_center/notification.h"
31 #include "ui/views/border.h"
32 #include "ui/views/controls/label.h"
33 #include "ui/views/layout/box_layout.h"
34 #include "ui/views/layout/grid_layout.h"
35 #include "ui/views/view.h" 24 #include "ui/views/view.h"
36 25
37 using message_center::Notification;
38
39 namespace ash { 26 namespace ash {
40 namespace { 27 namespace {
41 28
42 // If the remaining session time falls below this threshold, the user should be 29 // If the remaining session time falls below this threshold, the user should be
43 // informed that the session is about to expire. 30 // informed that the session is about to expire.
44 const int kExpiringSoonThresholdInSeconds = 5 * 60; // 5 minutes. 31 const int kExpiringSoonThresholdInMinutes = 5;
45 32
46 // Color in which the remaining session time is normally shown. 33 // Use 500ms interval for updates to notification and tray bubble to reduce the
47 const SkColor kRemainingTimeColor = SK_ColorWHITE; 34 // likelihood of a user-visible skip in high load situations (as might happen
48 // Color in which the remaining session time is shown when it is expiring soon. 35 // with 1000ms).
49 const SkColor kRemainingTimeExpiringSoonColor = SK_ColorRED; 36 const int kTimerIntervalInMilliseconds = 500;
50
51 views::Label* CreateAndSetupLabel() {
52 views::Label* label = new views::Label;
53 label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
54 SetupLabelForTray(label);
55 label->SetFontList(label->font_list().DeriveWithStyle(
56 label->font_list().GetFontStyle() & ~gfx::Font::BOLD));
57 return label;
58 }
59
60 base::string16 IntToTwoDigitString(int value) {
61 DCHECK_GE(value, 0);
62 DCHECK_LE(value, 99);
63 if (value < 10)
64 return base::ASCIIToUTF16("0") + base::IntToString16(value);
65 return base::IntToString16(value);
66 }
67
68 base::string16 FormatRemainingSessionTimeNotification(
69 const base::TimeDelta& remaining_session_time) {
70 return l10n_util::GetStringFUTF16(
71 IDS_ASH_STATUS_TRAY_REMAINING_SESSION_TIME_NOTIFICATION,
72 ui::TimeFormat::Detailed(ui::TimeFormat::FORMAT_DURATION,
73 ui::TimeFormat::LENGTH_LONG,
74 10,
75 remaining_session_time));
76 }
77
78 // Creates, or updates the notification for session length timeout with
79 // |remaining_time|. |state_changed| is true when its internal state has been
80 // changed from another.
81 void CreateOrUpdateNotification(const std::string& notification_id,
82 const base::TimeDelta& remaining_time,
83 bool state_changed) {
84 message_center::MessageCenter* message_center =
85 message_center::MessageCenter::Get();
86
87 // Do not create a new notification if no state has changed. It may happen
88 // when the notification is already closed by the user, see crbug.com/285941.
89 if (!state_changed && !message_center->HasNotification(notification_id))
90 return;
91
92 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
93 message_center::RichNotificationData data;
94 // Makes the spoken feedback only when the state has been changed.
95 data.should_make_spoken_feedback_for_popup_updates = state_changed;
96 scoped_ptr<Notification> notification(new Notification(
97 message_center::NOTIFICATION_TYPE_SIMPLE,
98 notification_id,
99 FormatRemainingSessionTimeNotification(remaining_time),
100 base::string16() /* message */,
101 bundle.GetImageNamed(IDR_AURA_UBER_TRAY_SESSION_LENGTH_LIMIT_TIMER),
102 base::string16() /* display_source */,
103 message_center::NotifierId(
104 message_center::NotifierId::SYSTEM_COMPONENT,
105 system_notifier::kNotifierSessionLengthTimeout),
106 data,
107 NULL /* delegate */));
108 notification->SetSystemPriority();
109 message_center::MessageCenter::Get()->AddNotification(notification.Pass());
110 }
111 37
112 } // namespace 38 } // namespace
113 39
114 namespace tray {
115
116 class RemainingSessionTimeTrayView : public views::View {
117 public:
118 RemainingSessionTimeTrayView(const TraySessionLengthLimit* owner,
119 ShelfAlignment shelf_alignment);
120 virtual ~RemainingSessionTimeTrayView();
121
122 void UpdateClockLayout(ShelfAlignment shelf_alignment);
123 void Update();
124
125 private:
126 void SetBorderFromAlignment(ShelfAlignment shelf_alignment);
127
128 const TraySessionLengthLimit* owner_;
129
130 views::Label* horizontal_layout_label_;
131 views::Label* vertical_layout_label_hours_left_;
132 views::Label* vertical_layout_label_hours_right_;
133 views::Label* vertical_layout_label_minutes_left_;
134 views::Label* vertical_layout_label_minutes_right_;
135 views::Label* vertical_layout_label_seconds_left_;
136 views::Label* vertical_layout_label_seconds_right_;
137
138 DISALLOW_COPY_AND_ASSIGN(RemainingSessionTimeTrayView);
139 };
140
141 RemainingSessionTimeTrayView::RemainingSessionTimeTrayView(
142 const TraySessionLengthLimit* owner,
143 ShelfAlignment shelf_alignment)
144 : owner_(owner),
145 horizontal_layout_label_(NULL),
146 vertical_layout_label_hours_left_(NULL),
147 vertical_layout_label_hours_right_(NULL),
148 vertical_layout_label_minutes_left_(NULL),
149 vertical_layout_label_minutes_right_(NULL),
150 vertical_layout_label_seconds_left_(NULL),
151 vertical_layout_label_seconds_right_(NULL) {
152 UpdateClockLayout(shelf_alignment);
153 }
154
155 RemainingSessionTimeTrayView::~RemainingSessionTimeTrayView() {
156 }
157
158 void RemainingSessionTimeTrayView::UpdateClockLayout(
159 ShelfAlignment shelf_alignment) {
160 SetBorderFromAlignment(shelf_alignment);
161 const bool horizontal_layout = (shelf_alignment == SHELF_ALIGNMENT_BOTTOM ||
162 shelf_alignment == SHELF_ALIGNMENT_TOP);
163 if (horizontal_layout && !horizontal_layout_label_) {
164 // Remove labels used for vertical layout.
165 RemoveAllChildViews(true);
166 vertical_layout_label_hours_left_ = NULL;
167 vertical_layout_label_hours_right_ = NULL;
168 vertical_layout_label_minutes_left_ = NULL;
169 vertical_layout_label_minutes_right_ = NULL;
170 vertical_layout_label_seconds_left_ = NULL;
171 vertical_layout_label_seconds_right_ = NULL;
172
173 // Create label used for horizontal layout.
174 horizontal_layout_label_ = CreateAndSetupLabel();
175
176 // Construct layout.
177 SetLayoutManager(
178 new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
179 AddChildView(horizontal_layout_label_);
180
181 } else if (!horizontal_layout && horizontal_layout_label_) {
182 // Remove label used for horizontal layout.
183 RemoveAllChildViews(true);
184 horizontal_layout_label_ = NULL;
185
186 // Create labels used for vertical layout.
187 vertical_layout_label_hours_left_ = CreateAndSetupLabel();
188 vertical_layout_label_hours_right_ = CreateAndSetupLabel();
189 vertical_layout_label_minutes_left_ = CreateAndSetupLabel();
190 vertical_layout_label_minutes_right_ = CreateAndSetupLabel();
191 vertical_layout_label_seconds_left_ = CreateAndSetupLabel();
192 vertical_layout_label_seconds_right_ = CreateAndSetupLabel();
193
194 // Construct layout.
195 views::GridLayout* layout = new views::GridLayout(this);
196 SetLayoutManager(layout);
197 views::ColumnSet* columns = layout->AddColumnSet(0);
198 columns->AddPaddingColumn(0, 6);
199 columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::CENTER,
200 0, views::GridLayout::USE_PREF, 0, 0);
201 columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::CENTER,
202 0, views::GridLayout::USE_PREF, 0, 0);
203 layout->AddPaddingRow(0, kTrayLabelItemVerticalPaddingVerticalAlignment);
204 layout->StartRow(0, 0);
205 layout->AddView(vertical_layout_label_hours_left_);
206 layout->AddView(vertical_layout_label_hours_right_);
207 layout->StartRow(0, 0);
208 layout->AddView(vertical_layout_label_minutes_left_);
209 layout->AddView(vertical_layout_label_minutes_right_);
210 layout->StartRow(0, 0);
211 layout->AddView(vertical_layout_label_seconds_left_);
212 layout->AddView(vertical_layout_label_seconds_right_);
213 layout->AddPaddingRow(0, kTrayLabelItemVerticalPaddingVerticalAlignment);
214 }
215 Update();
216 }
217
218 void RemainingSessionTimeTrayView::Update() {
219 const TraySessionLengthLimit::LimitState limit_state =
220 owner_->GetLimitState();
221
222 if (limit_state == TraySessionLengthLimit::LIMIT_NONE) {
223 SetVisible(false);
224 return;
225 }
226
227 int seconds = owner_->GetRemainingSessionTime().InSeconds();
228 // If the remaining session time is 100 hours or more, show 99:59:59 instead.
229 seconds = std::min(seconds, 100 * 60 * 60 - 1); // 100 hours - 1 second.
230 int minutes = seconds / 60;
231 seconds %= 60;
232 const int hours = minutes / 60;
233 minutes %= 60;
234
235 const base::string16 hours_str = IntToTwoDigitString(hours);
236 const base::string16 minutes_str = IntToTwoDigitString(minutes);
237 const base::string16 seconds_str = IntToTwoDigitString(seconds);
238 const SkColor color =
239 limit_state == TraySessionLengthLimit::LIMIT_EXPIRING_SOON ?
240 kRemainingTimeExpiringSoonColor : kRemainingTimeColor;
241
242 if (horizontal_layout_label_) {
243 horizontal_layout_label_->SetText(l10n_util::GetStringFUTF16(
244 IDS_ASH_STATUS_TRAY_REMAINING_SESSION_TIME,
245 hours_str, minutes_str, seconds_str));
246 horizontal_layout_label_->SetEnabledColor(color);
247 } else if (vertical_layout_label_hours_left_) {
248 vertical_layout_label_hours_left_->SetText(hours_str.substr(0, 1));
249 vertical_layout_label_hours_right_->SetText(hours_str.substr(1, 1));
250 vertical_layout_label_minutes_left_->SetText(minutes_str.substr(0, 1));
251 vertical_layout_label_minutes_right_->SetText(minutes_str.substr(1, 1));
252 vertical_layout_label_seconds_left_->SetText(seconds_str.substr(0, 1));
253 vertical_layout_label_seconds_right_->SetText(seconds_str.substr(1, 1));
254 vertical_layout_label_hours_left_->SetEnabledColor(color);
255 vertical_layout_label_hours_right_->SetEnabledColor(color);
256 vertical_layout_label_minutes_left_->SetEnabledColor(color);
257 vertical_layout_label_minutes_right_->SetEnabledColor(color);
258 vertical_layout_label_seconds_left_->SetEnabledColor(color);
259 vertical_layout_label_seconds_right_->SetEnabledColor(color);
260 }
261
262 Layout();
263 SetVisible(true);
264 }
265
266 void RemainingSessionTimeTrayView::SetBorderFromAlignment(
267 ShelfAlignment shelf_alignment) {
268 if (shelf_alignment == SHELF_ALIGNMENT_BOTTOM ||
269 shelf_alignment == SHELF_ALIGNMENT_TOP) {
270 SetBorder(views::Border::CreateEmptyBorder(
271 0,
272 kTrayLabelItemHorizontalPaddingBottomAlignment,
273 0,
274 kTrayLabelItemHorizontalPaddingBottomAlignment));
275 } else {
276 SetBorder(views::Border::NullBorder());
277 }
278 }
279
280 } // namespace tray
281
282 // static 40 // static
283 const char TraySessionLengthLimit::kNotificationId[] = 41 const char TraySessionLengthLimit::kNotificationId[] =
284 "chrome://session/timeout"; 42 "chrome://session/timeout";
285 43
286 TraySessionLengthLimit::TraySessionLengthLimit(SystemTray* system_tray) 44 TraySessionLengthLimit::TraySessionLengthLimit(SystemTray* system_tray)
287 : SystemTrayItem(system_tray), 45 : SystemTrayItem(system_tray),
288 tray_view_(NULL), 46 limit_state_(LIMIT_NONE),
289 limit_state_(LIMIT_NONE) { 47 last_limit_state_(LIMIT_NONE),
48 tray_bubble_view_(NULL) {
290 Shell::GetInstance()->system_tray_notifier()-> 49 Shell::GetInstance()->system_tray_notifier()->
291 AddSessionLengthLimitObserver(this); 50 AddSessionLengthLimitObserver(this);
292 Update(); 51 Update();
293 } 52 }
294 53
295 TraySessionLengthLimit::~TraySessionLengthLimit() { 54 TraySessionLengthLimit::~TraySessionLengthLimit() {
296 Shell::GetInstance()->system_tray_notifier()-> 55 Shell::GetInstance()->system_tray_notifier()->
297 RemoveSessionLengthLimitObserver(this); 56 RemoveSessionLengthLimitObserver(this);
298 } 57 }
299 58
300 views::View* TraySessionLengthLimit::CreateTrayView(user::LoginStatus status) { 59 // Add view to tray bubble.
301 CHECK(tray_view_ == NULL); 60 views::View* TraySessionLengthLimit::CreateDefaultView(
302 tray_view_ = new tray::RemainingSessionTimeTrayView( 61 user::LoginStatus status) {
303 this, system_tray()->shelf_alignment()); 62 CHECK(tray_bubble_view_ == NULL);
bartfab (slow) 2014/05/05 13:45:04 Nit: CHECK(!tray_bubble_view_);
Thiemo Nagel 2014/05/05 14:48:41 Done.
304 return tray_view_; 63 UpdateState();
64 if (limit_state_ == LIMIT_NONE)
65 return NULL;
66 tray_bubble_view_ = new LabelTrayView(
67 this, IDR_AURA_UBER_TRAY_BUBBLE_SESSION_LENGTH_LIMIT);
68 tray_bubble_view_->SetMessage(tray_bubble_message_);
69 last_tray_bubble_message_ = tray_bubble_message_;
70 return tray_bubble_view_;
305 } 71 }
306 72
307 void TraySessionLengthLimit::DestroyTrayView() { 73 // View has been removed from tray bubble.
308 tray_view_ = NULL; 74 void TraySessionLengthLimit::DestroyDefaultView() {
309 } 75 tray_bubble_view_ = NULL;
310
311 void TraySessionLengthLimit::UpdateAfterShelfAlignmentChange(
312 ShelfAlignment alignment) {
313 if (tray_view_)
314 tray_view_->UpdateClockLayout(alignment);
315 } 76 }
316 77
317 void TraySessionLengthLimit::OnSessionStartTimeChanged() { 78 void TraySessionLengthLimit::OnSessionStartTimeChanged() {
318 Update(); 79 Update();
319 } 80 }
320 81
321 void TraySessionLengthLimit::OnSessionLengthLimitChanged() { 82 void TraySessionLengthLimit::OnSessionLengthLimitChanged() {
322 Update(); 83 Update();
323 } 84 }
324 85
86 void TraySessionLengthLimit::OnViewClicked(views::View* sender) {
87 }
88
325 TraySessionLengthLimit::LimitState 89 TraySessionLengthLimit::LimitState
326 TraySessionLengthLimit::GetLimitState() const { 90 TraySessionLengthLimit::GetLimitState() const {
327 return limit_state_; 91 return limit_state_;
328 } 92 }
329 93
330 base::TimeDelta TraySessionLengthLimit::GetRemainingSessionTime() const { 94 base::TimeDelta TraySessionLengthLimit::GetRemainingSessionTime() const {
331 return remaining_session_time_; 95 return remaining_session_time_;
332 } 96 }
333 97
334 void TraySessionLengthLimit::Update() { 98 void TraySessionLengthLimit::Update() {
99 UpdateState();
100 UpdateUI();
101 }
102
103 void TraySessionLengthLimit::UpdateState() {
335 SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate(); 104 SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
336 const LimitState previous_limit_state = limit_state_; 105 if (delegate->GetSessionStartTime(&session_start_time_) &&
337 if (!delegate->GetSessionStartTime(&session_start_time_) || 106 delegate->GetSessionLengthLimit(&limit_)) {
338 !delegate->GetSessionLengthLimit(&limit_)) { 107 const base::TimeDelta expiring_soon_threshold(
339 remaining_session_time_ = base::TimeDelta(); 108 base::TimeDelta::FromMinutes(kExpiringSoonThresholdInMinutes));
340 limit_state_ = LIMIT_NONE;
341 timer_.reset();
342 } else {
343 remaining_session_time_ = std::max( 109 remaining_session_time_ = std::max(
344 limit_ - (base::TimeTicks::Now() - session_start_time_), 110 limit_ - (base::TimeTicks::Now() - session_start_time_),
345 base::TimeDelta()); 111 base::TimeDelta());
346 limit_state_ = remaining_session_time_.InSeconds() <= 112 limit_state_ = remaining_session_time_ <= expiring_soon_threshold ?
347 kExpiringSoonThresholdInSeconds ? LIMIT_EXPIRING_SOON : LIMIT_SET; 113 LIMIT_EXPIRING_SOON : LIMIT_SET;
348 if (!timer_) 114 } else {
349 timer_.reset(new base::RepeatingTimer<TraySessionLengthLimit>); 115 remaining_session_time_ = base::TimeDelta();
350 if (!timer_->IsRunning()) { 116 limit_state_ = LIMIT_NONE;
351 // Start a timer that will update the remaining session time every second.
352 timer_->Start(FROM_HERE,
353 base::TimeDelta::FromSeconds(1),
354 this,
355 &TraySessionLengthLimit::Update);
356 }
357 } 117 }
358 118
359 switch (limit_state_) { 119 switch (limit_state_) {
bartfab (slow) 2014/05/05 13:45:04 Nit: There is no need for this switch statement an
Thiemo Nagel 2014/05/05 14:48:41 At least for the moment, I'd like to keep the swit
bartfab (slow) 2014/05/05 17:49:58 Do you have any indication that that will be requi
Thiemo Nagel 2014/05/06 14:28:00 OK, it's removed.
360 case LIMIT_NONE: 120 case LIMIT_NONE:
361 message_center::MessageCenter::Get()->RemoveNotification( 121 tray_bubble_message_.clear();
362 kNotificationId, false /* by_user */); 122 notification_message_.clear();
bartfab (slow) 2014/05/05 13:45:04 Clear the last_ messages as well.
Thiemo Nagel 2014/05/05 14:48:41 Good catch! Done.
123 timer_.reset();
363 break; 124 break;
364 case LIMIT_SET: 125 case LIMIT_SET:
365 CreateOrUpdateNotification(
366 kNotificationId,
367 remaining_session_time_,
368 previous_limit_state == LIMIT_NONE);
369 break;
370 case LIMIT_EXPIRING_SOON: 126 case LIMIT_EXPIRING_SOON:
371 CreateOrUpdateNotification( 127 tray_bubble_message_ = l10n_util::GetStringFUTF16(
bartfab (slow) 2014/05/05 13:45:04 Rather than passing information between methods vi
Thiemo Nagel 2014/05/05 14:48:41 I'd like to keep UpdateState() separate because Cr
bartfab (slow) 2014/05/05 17:49:58 What you would gain are considerable memory saving
Thiemo Nagel 2014/05/06 14:28:00 All redundant strings have been removed.
372 kNotificationId, 128 IDS_ASH_STATUS_TRAY_BUBBLE_SESSION_LENGTH_LIMIT,
373 remaining_session_time_, 129 ui::TimeFormat::Detailed(ui::TimeFormat::FORMAT_DURATION,
374 previous_limit_state == LIMIT_NONE || 130 ui::TimeFormat::LENGTH_LONG,
375 previous_limit_state == LIMIT_SET); 131 10,
132 remaining_session_time_));
133 notification_message_ = l10n_util::GetStringFUTF16(
134 IDS_ASH_STATUS_TRAY_NOTIFICATION_SESSION_LENGTH_LIMIT,
135 ui::TimeFormat::Detailed(ui::TimeFormat::FORMAT_DURATION,
136 ui::TimeFormat::LENGTH_LONG,
137 10,
138 remaining_session_time_));
139 if (!timer_)
140 timer_.reset(new base::RepeatingTimer<TraySessionLengthLimit>);
141 if (!timer_->IsRunning()) {
142 timer_->Start(FROM_HERE,
143 base::TimeDelta::FromMilliseconds(
144 kTimerIntervalInMilliseconds),
145 this,
146 &TraySessionLengthLimit::Update);
147 }
376 break; 148 break;
377 } 149 }
378
379 // Update the tray view last so that it can check whether the notification
380 // view is currently visible or not.
381 if (tray_view_)
382 tray_view_->Update();
383 } 150 }
384 151
385 bool TraySessionLengthLimit::IsTrayViewVisibleForTest() { 152 void TraySessionLengthLimit::UpdateUI() {
386 return tray_view_ && tray_view_->visible(); 153 UpdateNotification();
154 UpdateTrayBubbleView();
155 }
156
157 void TraySessionLengthLimit::UpdateNotification() {
158 message_center::MessageCenter* message_center =
159 message_center::MessageCenter::Get();
160
161 // If state hasn't changed and the notification message hasn't changed,
162 // there's nothing to do.
163 if (limit_state_ == last_limit_state_ &&
164 notification_message_ == last_notification_message_) {
165 return;
166 }
167
168 // If state hasn't changed and the notification has already been acknowledged,
169 // we won't re-create it.
170 if (limit_state_ == last_limit_state_ &&
171 !message_center->HasNotification(kNotificationId)) {
172 return;
173 }
174
175 // After state change, any possibly existing notification is removed to make
176 // sure it is re-shown even if it had been acknowledged by the user before
177 // (and in the rare case of state change towards LIMIT_NONE to make the
178 // notification disappear).
179 if (limit_state_ != last_limit_state_ &&
180 message_center->HasNotification(kNotificationId)) {
181 message_center::MessageCenter::Get()->RemoveNotification(
182 kNotificationId, false /* by_user */);
183 }
184
185 // For LIMIT_NONE, there's nothing more to do.
186 if (limit_state_ == LIMIT_NONE) {
187 last_limit_state_ = limit_state_;
188 return;
189 }
190
191 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
192 message_center::RichNotificationData data;
193 data.should_make_spoken_feedback_for_popup_updates =
194 (limit_state_ != last_limit_state_);
195 scoped_ptr<message_center::Notification> notification(
196 new message_center::Notification(
197 message_center::NOTIFICATION_TYPE_SIMPLE,
198 kNotificationId,
199 base::string16() /* title */,
200 notification_message_ /* message */,
201 bundle.GetImageNamed(
202 IDR_AURA_UBER_TRAY_NOTIFICATION_SESSION_LENGTH_LIMIT),
203 base::string16() /* display_source */,
204 message_center::NotifierId(
205 message_center::NotifierId::SYSTEM_COMPONENT,
206 system_notifier::kNotifierSessionLengthTimeout),
207 data,
208 NULL /* delegate */));
209 notification->SetSystemPriority();
210 if (message_center->HasNotification(kNotificationId))
211 message_center->UpdateNotification(kNotificationId, notification.Pass());
212 else
213 message_center->AddNotification(notification.Pass());
214 last_limit_state_ = limit_state_;
215 last_notification_message_ = notification_message_;
216 }
217
218 void TraySessionLengthLimit::UpdateTrayBubbleView() {
219 if (!tray_bubble_view_)
220 return;
221 if (tray_bubble_message_ == last_tray_bubble_message_)
222 return;
223 tray_bubble_view_->SetMessage(tray_bubble_message_);
bartfab (slow) 2014/05/05 13:45:04 Why is |last_tray_bubble_message_| necessary? Can
Thiemo Nagel 2014/05/05 14:48:41 I haven't tested it, but I figure that Layout() is
bartfab (slow) 2014/05/05 17:49:58 Looking at the code, Layout() here should be very
Thiemo Nagel 2014/05/06 14:28:00 Ok, fine, after our offline discussion I'm removin
224 tray_bubble_view_->Layout();
225 last_tray_bubble_message_ = tray_bubble_message_;
387 } 226 }
388 227
389 } // namespace ash 228 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698