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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 | 110 |
111 // Convenience accessors: | 111 // Convenience accessors: |
112 SystemTrayBubble* bubble() const { return bubble_.get(); } | 112 SystemTrayBubble* bubble() const { return bubble_.get(); } |
113 SystemTrayBubble::BubbleType bubble_type() const { | 113 SystemTrayBubble::BubbleType bubble_type() const { |
114 return bubble_->bubble_type(); | 114 return bubble_->bubble_type(); |
115 } | 115 } |
116 TrayBubbleView* bubble_view() const { return bubble_->bubble_view(); } | 116 TrayBubbleView* bubble_view() const { return bubble_->bubble_view(); } |
117 bool is_persistent() const { return is_persistent_; } | 117 bool is_persistent() const { return is_persistent_; } |
118 | 118 |
119 private: | 119 private: |
120 scoped_ptr<SystemTrayBubble> bubble_; | 120 std::unique_ptr<SystemTrayBubble> bubble_; |
121 scoped_ptr<TrayBubbleWrapper> bubble_wrapper_; | 121 std::unique_ptr<TrayBubbleWrapper> bubble_wrapper_; |
122 bool is_persistent_; | 122 bool is_persistent_; |
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), |
(...skipping 600 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
732 system_bubble_.reset(); | 732 system_bubble_.reset(); |
733 // When closing a system bubble with the alternate shelf layout, we need to | 733 // When closing a system bubble with the alternate shelf layout, we need to |
734 // turn off the active tinting of the shelf. | 734 // turn off the active tinting of the shelf. |
735 if (full_system_tray_menu_) { | 735 if (full_system_tray_menu_) { |
736 SetDrawBackgroundAsActive(false); | 736 SetDrawBackgroundAsActive(false); |
737 full_system_tray_menu_ = false; | 737 full_system_tray_menu_ = false; |
738 } | 738 } |
739 } | 739 } |
740 | 740 |
741 } // namespace ash | 741 } // namespace ash |
OLD | NEW |