Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 214 tray_date_(nullptr), | 214 tray_date_(nullptr), |
| 215 tray_network_(nullptr), | 215 tray_network_(nullptr), |
| 216 tray_tiles_(nullptr), | 216 tray_tiles_(nullptr), |
| 217 tray_system_info_(nullptr), | 217 tray_system_info_(nullptr), |
| 218 tray_update_(nullptr), | 218 tray_update_(nullptr), |
| 219 screen_capture_tray_item_(nullptr), | 219 screen_capture_tray_item_(nullptr), |
| 220 screen_share_tray_item_(nullptr) { | 220 screen_share_tray_item_(nullptr) { |
| 221 if (MaterialDesignController::IsShelfMaterial()) { | 221 if (MaterialDesignController::IsShelfMaterial()) { |
| 222 SetInkDropMode(InkDropMode::ON); | 222 SetInkDropMode(InkDropMode::ON); |
| 223 SetContentsBackground(false); | 223 SetContentsBackground(false); |
| 224 SetSeparatorVisibility(false); | |
|
James Cook
2017/01/09 23:50:53
nit: add a comment saying why this doesn't need th
yiyix
2017/01/10 01:02:53
similar to above, thank you.
| |
| 224 } else { | 225 } else { |
| 225 SetContentsBackground(true); | 226 SetContentsBackground(true); |
| 226 } | 227 } |
| 227 } | 228 } |
| 228 | 229 |
| 229 SystemTray::~SystemTray() { | 230 SystemTray::~SystemTray() { |
| 230 // Destroy any child views that might have back pointers before ~View(). | 231 // Destroy any child views that might have back pointers before ~View(). |
| 231 activation_observer_.reset(); | 232 activation_observer_.reset(); |
| 232 key_event_watcher_.reset(); | 233 key_event_watcher_.reset(); |
| 233 system_bubble_.reset(); | 234 system_bubble_.reset(); |
| (...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 895 .work_area() | 896 .work_area() |
| 896 .height(); | 897 .height(); |
| 897 if (work_area_height > 0) { | 898 if (work_area_height > 0) { |
| 898 UMA_HISTOGRAM_CUSTOM_COUNTS( | 899 UMA_HISTOGRAM_CUSTOM_COUNTS( |
| 899 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", | 900 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", |
| 900 100 * bubble_view->height() / work_area_height, 1, 300, 100); | 901 100 * bubble_view->height() / work_area_height, 1, 300, 100); |
| 901 } | 902 } |
| 902 } | 903 } |
| 903 | 904 |
| 904 } // namespace ash | 905 } // namespace ash |
| OLD | NEW |