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

Side by Side Diff: ash/common/system/tray/system_tray.cc

Issue 2510603003: Add ink drop ripple to status tray (Closed)
Patch Set: Addressed review comments Created 4 years, 1 month 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
« no previous file with comments | « no previous file | ash/common/system/tray/tray_background_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/common/system/tray/system_tray.h" 5 #include "ash/common/system/tray/system_tray.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 full_system_tray_menu_(false), 218 full_system_tray_menu_(false),
219 tray_accessibility_(nullptr), 219 tray_accessibility_(nullptr),
220 tray_audio_(nullptr), 220 tray_audio_(nullptr),
221 tray_cast_(nullptr), 221 tray_cast_(nullptr),
222 tray_date_(nullptr), 222 tray_date_(nullptr),
223 tray_tiles_(nullptr), 223 tray_tiles_(nullptr),
224 tray_system_info_(nullptr), 224 tray_system_info_(nullptr),
225 tray_update_(nullptr), 225 tray_update_(nullptr),
226 screen_capture_tray_item_(nullptr), 226 screen_capture_tray_item_(nullptr),
227 screen_share_tray_item_(nullptr) { 227 screen_share_tray_item_(nullptr) {
228 SetContentsBackground(true); 228 if (MaterialDesignController::IsShelfMaterial()) {
229 SetInkDropMode(InkDropMode::ON);
230 SetContentsBackground(false);
231 } else {
232 SetContentsBackground(true);
233 }
229 } 234 }
230 235
231 SystemTray::~SystemTray() { 236 SystemTray::~SystemTray() {
232 // Destroy any child views that might have back pointers before ~View(). 237 // Destroy any child views that might have back pointers before ~View().
233 activation_observer_.reset(); 238 activation_observer_.reset();
234 key_event_watcher_.reset(); 239 key_event_watcher_.reset();
235 system_bubble_.reset(); 240 system_bubble_.reset();
236 notification_bubble_.reset(); 241 notification_bubble_.reset();
237 for (std::vector<SystemTrayItem*>::iterator it = items_.begin(); 242 for (std::vector<SystemTrayItem*>::iterator it = items_.begin();
238 it != items_.end(); ++it) { 243 it != items_.end(); ++it) {
(...skipping 669 matching lines...) Expand 10 before | Expand all | Expand 10 after
908 .work_area() 913 .work_area()
909 .height(); 914 .height();
910 if (work_area_height > 0) { 915 if (work_area_height > 0) {
911 UMA_HISTOGRAM_CUSTOM_COUNTS( 916 UMA_HISTOGRAM_CUSTOM_COUNTS(
912 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", 917 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
913 100 * bubble_view->height() / work_area_height, 1, 300, 100); 918 100 * bubble_view->height() / work_area_height, 1, 300, 100);
914 } 919 }
915 } 920 }
916 921
917 } // namespace ash 922 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/common/system/tray/tray_background_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698