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

Side by Side Diff: ash/system/session/logout_button_tray.h

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: 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
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_SESSION_LOGOUT_BUTTON_TRAY_H_ 5 #ifndef ASH_SYSTEM_SESSION_LOGOUT_BUTTON_TRAY_H_
6 #define ASH_SYSTEM_SESSION_LOGOUT_BUTTON_TRAY_H_ 6 #define ASH_SYSTEM_SESSION_LOGOUT_BUTTON_TRAY_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/login_status.h" 9 #include "ash/common/login_status.h"
10 #include "ash/system/session/logout_button_observer.h" 10 #include "ash/system/session/logout_button_observer.h"
11 #include "ash/system/tray/tray_background_view.h" 11 #include "ash/system/tray/tray_background_view.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/time/time.h" 13 #include "base/time/time.h"
14 #include "ui/views/controls/button/button.h" 14 #include "ui/views/controls/button/button.h"
15 15
16 namespace views { 16 namespace views {
17 class LabelButton; 17 class LabelButton;
18 } 18 }
19 19
(...skipping 29 matching lines...) Expand all
49 LoginStatus login_status_; 49 LoginStatus login_status_;
50 bool show_logout_button_in_tray_; 50 bool show_logout_button_in_tray_;
51 base::TimeDelta dialog_duration_; 51 base::TimeDelta dialog_duration_;
52 52
53 DISALLOW_COPY_AND_ASSIGN(LogoutButtonTray); 53 DISALLOW_COPY_AND_ASSIGN(LogoutButtonTray);
54 }; 54 };
55 55
56 } // namespace ash 56 } // namespace ash
57 57
58 #endif // ASH_SYSTEM_SESSION_LOGOUT_BUTTON_TRAY_H_ 58 #endif // ASH_SYSTEM_SESSION_LOGOUT_BUTTON_TRAY_H_
OLDNEW
« no previous file with comments | « ash/system/screen_security/screen_tray_item_unittest.cc ('k') | ash/system/session/logout_button_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698