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

Side by Side Diff: ash/system/status_area_widget.cc

Issue 2053113002: Replaced BackgroundAnimator with ShelfBackgroundAnimator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved ash/test/material_design_controller_test_api.(h|cc) to ash/common/material_design/test/. 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/status_area_widget.h" 5 #include "ash/system/status_area_widget.h"
6 6
7 #include "ash/common/shell_window_ids.h" 7 #include "ash/common/shell_window_ids.h"
8 #include "ash/common/system/tray/system_tray_delegate.h" 8 #include "ash/common/system/tray/system_tray_delegate.h"
9 #include "ash/common/wm_root_window_controller.h" 9 #include "ash/common/wm_root_window_controller.h"
10 #include "ash/common/wm_shell.h" 10 #include "ash/common/wm_shell.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 if (Shell::GetInstance()->in_mus() && shelf_widget_->shelf_layout_manager()) 140 if (Shell::GetInstance()->in_mus() && shelf_widget_->shelf_layout_manager())
141 shelf_widget_->shelf_layout_manager()->UpdateAutoHideForMouseEvent(event); 141 shelf_widget_->shelf_layout_manager()->UpdateAutoHideForMouseEvent(event);
142 } 142 }
143 143
144 void StatusAreaWidget::OnGestureEvent(ui::GestureEvent* event) { 144 void StatusAreaWidget::OnGestureEvent(ui::GestureEvent* event) {
145 Widget::OnGestureEvent(event); 145 Widget::OnGestureEvent(event);
146 if (Shell::GetInstance()->in_mus() && shelf_widget_->shelf_layout_manager()) 146 if (Shell::GetInstance()->in_mus() && shelf_widget_->shelf_layout_manager())
147 shelf_widget_->shelf_layout_manager()->UpdateAutoHideForGestureEvent(event); 147 shelf_widget_->shelf_layout_manager()->UpdateAutoHideForGestureEvent(event);
148 } 148 }
149 149
150 void StatusAreaWidget::UpdateShelfItemBackground(int alpha) {
151 web_notification_tray_->UpdateShelfItemBackground(alpha);
152 system_tray_->UpdateShelfItemBackground(alpha);
153 #if defined(OS_CHROMEOS)
154 virtual_keyboard_tray_->UpdateShelfItemBackground(alpha);
155 logout_button_tray_->UpdateShelfItemBackground(alpha);
156 #endif
157 overview_button_tray_->UpdateShelfItemBackground(alpha);
158 }
159
150 void StatusAreaWidget::AddSystemTray() { 160 void StatusAreaWidget::AddSystemTray() {
151 system_tray_ = new SystemTray(this); 161 system_tray_ = new SystemTray(this);
152 status_area_widget_delegate_->AddTray(system_tray_); 162 status_area_widget_delegate_->AddTray(system_tray_);
153 } 163 }
154 164
155 void StatusAreaWidget::AddWebNotificationTray() { 165 void StatusAreaWidget::AddWebNotificationTray() {
156 web_notification_tray_ = new WebNotificationTray(this); 166 web_notification_tray_ = new WebNotificationTray(this);
157 status_area_widget_delegate_->AddTray(web_notification_tray_); 167 status_area_widget_delegate_->AddTray(web_notification_tray_);
158 } 168 }
159 169
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 web_notification_tray_->UpdateAfterLoginStatusChange(login_status); 216 web_notification_tray_->UpdateAfterLoginStatusChange(login_status);
207 #if defined(OS_CHROMEOS) 217 #if defined(OS_CHROMEOS)
208 if (logout_button_tray_) 218 if (logout_button_tray_)
209 logout_button_tray_->UpdateAfterLoginStatusChange(login_status); 219 logout_button_tray_->UpdateAfterLoginStatusChange(login_status);
210 #endif 220 #endif
211 if (overview_button_tray_) 221 if (overview_button_tray_)
212 overview_button_tray_->UpdateAfterLoginStatusChange(login_status); 222 overview_button_tray_->UpdateAfterLoginStatusChange(login_status);
213 } 223 }
214 224
215 } // namespace ash 225 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698