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

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

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 8 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
« no previous file with comments | « ash/system/tray/system_tray.h ('k') | ash/system/tray/system_tray_bubble.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/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
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
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
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray.h ('k') | ash/system/tray/system_tray_bubble.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698