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

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

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay
Patch Set: cleanup test Created 4 years, 5 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
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"
10 #include "ash/common/system/tray/system_tray_item.h" 11 #include "ash/common/system/tray/system_tray_item.h"
11 #include "ash/common/system/tray/tray_item_view.h" 12 #include "ash/common/system/tray/tray_item_view.h"
12 #include "ash/common/system/tray/tray_notification_view.h" 13 #include "ash/common/system/tray/tray_notification_view.h"
13 #include "ash/common/system/tray/tray_popup_label_button.h" 14 #include "ash/common/system/tray/tray_popup_label_button.h"
14 #include "ash/system/tray/system_tray.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "ui/message_center/notification_delegate.h" 16 #include "ui/message_center/notification_delegate.h"
17 #include "ui/views/controls/button/button.h" 17 #include "ui/views/controls/button/button.h"
18 #include "ui/views/controls/image_view.h" 18 #include "ui/views/controls/image_view.h"
19 19
20 namespace views { 20 namespace views {
21 class View; 21 class View;
22 } 22 }
23 23
24 namespace ash { 24 namespace ash {
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 tray::ScreenStatusView* default_view_; 135 tray::ScreenStatusView* default_view_;
136 bool is_started_; 136 bool is_started_;
137 base::Closure stop_callback_; 137 base::Closure stop_callback_;
138 138
139 DISALLOW_COPY_AND_ASSIGN(ScreenTrayItem); 139 DISALLOW_COPY_AND_ASSIGN(ScreenTrayItem);
140 }; 140 };
141 141
142 } // namespace ash 142 } // namespace ash
143 143
144 #endif // ASH_COMMON_SYSTEM_CHROMEOS_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_ 144 #endif // ASH_COMMON_SYSTEM_CHROMEOS_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698