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/system/tray/system_tray.h" | 5 #include "ash/system/tray/system_tray.h" |
| 6 | 6 |
| 7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/metrics/user_metrics_recorder.h" | 8 #include "ash/metrics/user_metrics_recorder.h" |
| 9 #include "ash/shelf/shelf_layout_manager.h" | 9 #include "ash/shelf/shelf_layout_manager.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 123 | 123 |
| 124 DISALLOW_COPY_AND_ASSIGN(SystemBubbleWrapper); | 124 DISALLOW_COPY_AND_ASSIGN(SystemBubbleWrapper); |
| 125 }; | 125 }; |
| 126 | 126 |
| 127 | 127 |
| 128 // SystemTray | 128 // SystemTray |
| 129 | 129 |
| 130 SystemTray::SystemTray(StatusAreaWidget* status_area_widget) | 130 SystemTray::SystemTray(StatusAreaWidget* status_area_widget) |
| 131 : TrayBackgroundView(status_area_widget), | 131 : TrayBackgroundView(status_area_widget), |
| 132 items_(), | 132 items_(), |
| 133 detailed_item_(nullptr), | |
| 133 default_bubble_height_(0), | 134 default_bubble_height_(0), |
| 134 hide_notifications_(false), | 135 hide_notifications_(false), |
| 135 full_system_tray_menu_(false), | 136 full_system_tray_menu_(false), |
| 136 tray_accessibility_(NULL), | 137 tray_accessibility_(nullptr), |
| 137 tray_date_(NULL) { | 138 tray_cast_(nullptr), |
| 139 tray_date_(nullptr), | |
| 140 screen_capture_tray_item_(nullptr), | |
| 141 screen_share_tray_item_(nullptr) { | |
|
stevenjb
2016/03/30 00:47:57
Bleh. These probably shouldn't exist, but somethin
| |
| 138 SetContentsBackground(); | 142 SetContentsBackground(); |
| 139 } | 143 } |
| 140 | 144 |
| 141 SystemTray::~SystemTray() { | 145 SystemTray::~SystemTray() { |
| 142 // Destroy any child views that might have back pointers before ~View(). | 146 // Destroy any child views that might have back pointers before ~View(). |
| 143 system_bubble_.reset(); | 147 system_bubble_.reset(); |
| 144 notification_bubble_.reset(); | 148 notification_bubble_.reset(); |
| 145 for (std::vector<SystemTrayItem*>::iterator it = items_.begin(); | 149 for (std::vector<SystemTrayItem*>::iterator it = items_.begin(); |
| 146 it != items_.end(); | 150 it != items_.end(); |
| 147 ++it) { | 151 ++it) { |
| (...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 735 system_bubble_.reset(); | 739 system_bubble_.reset(); |
| 736 // When closing a system bubble with the alternate shelf layout, we need to | 740 // When closing a system bubble with the alternate shelf layout, we need to |
| 737 // turn off the active tinting of the shelf. | 741 // turn off the active tinting of the shelf. |
| 738 if (full_system_tray_menu_) { | 742 if (full_system_tray_menu_) { |
| 739 SetDrawBackgroundAsActive(false); | 743 SetDrawBackgroundAsActive(false); |
| 740 full_system_tray_menu_ = false; | 744 full_system_tray_menu_ = false; |
| 741 } | 745 } |
| 742 } | 746 } |
| 743 | 747 |
| 744 } // namespace ash | 748 } // namespace ash |
| OLD | NEW |