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

Side by Side Diff: ash/common/system/chromeos/screen_security/screen_tray_item.h

Issue 2743523003: Remove non-MD code from screen_tray_item.cc (Closed)
Patch Set: Included missing headers Created 3 years, 9 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 | « no previous file | ash/common/system/chromeos/screen_security/screen_tray_item.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_COMMON_SYSTEM_CHROMEOS_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_ 5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_
6 #define ASH_COMMON_SYSTEM_CHROMEOS_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_ 6 #define ASH_COMMON_SYSTEM_CHROMEOS_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/common/system/tray/system_tray.h"
11 #include "ash/common/system/tray/system_tray_item.h" 10 #include "ash/common/system/tray/system_tray_item.h"
12 #include "ash/common/system/tray/tray_item_view.h" 11 #include "ash/common/system/tray/tray_item_view.h"
13 #include "ash/common/system/tray/tray_notification_view.h"
14 #include "base/macros.h" 12 #include "base/macros.h"
15 #include "ui/message_center/notification_delegate.h" 13 #include "ui/message_center/notification_delegate.h"
16 #include "ui/views/controls/button/button.h" 14 #include "ui/views/controls/button/button.h"
17 #include "ui/views/controls/image_view.h" 15 #include "ui/views/view.h"
18 16
19 namespace views { 17 namespace views {
20 class View; 18 class ImageView;
21 } 19 }
22 20
23 namespace ash { 21 namespace ash {
24 class ScreenTrayItem; 22 class ScreenTrayItem;
23 class SystemTray;
25 24
26 namespace tray { 25 namespace tray {
27 26
28 class ScreenTrayView : public TrayItemView { 27 class ScreenTrayView : public TrayItemView {
29 public: 28 public:
30 explicit ScreenTrayView(ScreenTrayItem* screen_tray_item); 29 explicit ScreenTrayView(ScreenTrayItem* screen_tray_item);
31 ~ScreenTrayView() override; 30 ~ScreenTrayView() override;
32 31
33 void Update(); 32 void Update();
34 33
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 tray::ScreenStatusView* default_view_; 130 tray::ScreenStatusView* default_view_;
132 bool is_started_; 131 bool is_started_;
133 base::Closure stop_callback_; 132 base::Closure stop_callback_;
134 133
135 DISALLOW_COPY_AND_ASSIGN(ScreenTrayItem); 134 DISALLOW_COPY_AND_ASSIGN(ScreenTrayItem);
136 }; 135 };
137 136
138 } // namespace ash 137 } // namespace ash
139 138
140 #endif // ASH_COMMON_SYSTEM_CHROMEOS_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_ 139 #endif // ASH_COMMON_SYSTEM_CHROMEOS_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_
OLDNEW
« no previous file with comments | « no previous file | ash/common/system/chromeos/screen_security/screen_tray_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698