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

Side by Side Diff: ash/system/user/user_view.h

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_update.h ('k') | ash/system/user/user_view.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef ASH_SYSTEM_USER_USER_VIEW_H_ 5 #ifndef ASH_SYSTEM_USER_USER_VIEW_H_
6 #define ASH_SYSTEM_USER_USER_VIEW_H_ 6 #define ASH_SYSTEM_USER_USER_VIEW_H_
7 7
8 #include <memory>
9
8 #include "ash/session/session_state_delegate.h" 10 #include "ash/session/session_state_delegate.h"
9 #include "ash/system/tray/tray_constants.h" 11 #include "ash/system/tray/tray_constants.h"
10 #include "ash/system/user/login_status.h" 12 #include "ash/system/user/login_status.h"
11 #include "ash/system/user/tray_user.h" 13 #include "ash/system/user/tray_user.h"
12 #include "base/macros.h" 14 #include "base/macros.h"
13 #include "ui/views/controls/button/button.h" 15 #include "ui/views/controls/button/button.h"
14 #include "ui/views/focus/focus_manager.h" 16 #include "ui/views/focus/focus_manager.h"
15 #include "ui/views/layout/box_layout.h" 17 #include "ui/views/layout/box_layout.h"
16 #include "ui/views/mouse_watcher.h" 18 #include "ui/views/mouse_watcher.h"
17 #include "ui/views/view.h" 19 #include "ui/views/view.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 views::View* user_card_view_; 81 views::View* user_card_view_;
80 82
81 // This is the owner system tray item of this view. 83 // This is the owner system tray item of this view.
82 SystemTrayItem* owner_; 84 SystemTrayItem* owner_;
83 85
84 // True if |user_card_view_| is a |ButtonFromView| - otherwise it is only 86 // True if |user_card_view_| is a |ButtonFromView| - otherwise it is only
85 // a |UserCardView|. 87 // a |UserCardView|.
86 bool is_user_card_button_; 88 bool is_user_card_button_;
87 89
88 views::View* logout_button_; 90 views::View* logout_button_;
89 scoped_ptr<PopupMessage> popup_message_; 91 std::unique_ptr<PopupMessage> popup_message_;
90 scoped_ptr<views::Widget> add_menu_option_; 92 std::unique_ptr<views::Widget> add_menu_option_;
91 93
92 // False when the add user panel is visible but not activatable. 94 // False when the add user panel is visible but not activatable.
93 bool add_user_enabled_; 95 bool add_user_enabled_;
94 96
95 // The mouse watcher which takes care of out of window hover events. 97 // The mouse watcher which takes care of out of window hover events.
96 scoped_ptr<views::MouseWatcher> mouse_watcher_; 98 std::unique_ptr<views::MouseWatcher> mouse_watcher_;
97 99
98 // The focus manager which we use to detect focus changes. 100 // The focus manager which we use to detect focus changes.
99 views::FocusManager* focus_manager_; 101 views::FocusManager* focus_manager_;
100 102
101 DISALLOW_COPY_AND_ASSIGN(UserView); 103 DISALLOW_COPY_AND_ASSIGN(UserView);
102 }; 104 };
103 105
104 } // namespace tray 106 } // namespace tray
105 } // namespace ash 107 } // namespace ash
106 108
107 #endif // ASH_SYSTEM_USER_USER_VIEW_H_ 109 #endif // ASH_SYSTEM_USER_USER_VIEW_H_
OLDNEW
« no previous file with comments | « ash/system/tray_update.h ('k') | ash/system/user/user_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698