ash/common/system/chromeos/session/logout_button_tray.h - Issue 2108793002: mash: Convert system tray logout button to wm common types

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2108793002: mash: Convert system tray logout button to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more review comments, fix mash_unittests 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

« no previous file with comments | « ash/common/system/chromeos/session/last_window_closed_observer.h ('k') | ash/common/system/chromeos/session/logout_button_tray.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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_CHROMEOS_SESSION_LOGOUT_BUTTON_TRAY_H_	5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_SESSION_LOGOUT_BUTTON_TRAY_H_

6 #define ASH_SYSTEM_CHROMEOS_SESSION_LOGOUT_BUTTON_TRAY_H_	6 #define ASH_COMMON_SYSTEM_CHROMEOS_SESSION_LOGOUT_BUTTON_TRAY_H_

7	7

8 #include "ash/ash_export.h"	8 #include "ash/ash_export.h"

9 #include "ash/common/login_status.h"	9 #include "ash/common/login_status.h"

10 #include "ash/common/system/chromeos/session/logout_button_observer.h"	10 #include "ash/common/system/chromeos/session/logout_button_observer.h"

11 #include "ash/common/system/tray/tray_background_view.h"	11 #include "ash/common/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 {

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
49 views::LabelButton* button_;	49 views::LabelButton* button_;

50 LoginStatus login_status_;	50 LoginStatus login_status_;

51 bool show_logout_button_in_tray_;	51 bool show_logout_button_in_tray_;

52 base::TimeDelta dialog_duration_;	52 base::TimeDelta dialog_duration_;

53	53

54 DISALLOW_COPY_AND_ASSIGN(LogoutButtonTray);	54 DISALLOW_COPY_AND_ASSIGN(LogoutButtonTray);

55 };	55 };

56	56

57 } // namespace ash	57 } // namespace ash

58	58

59 #endif // ASH_SYSTEM_CHROMEOS_SESSION_LOGOUT_BUTTON_TRAY_H_	59 #endif // ASH_COMMON_SYSTEM_CHROMEOS_SESSION_LOGOUT_BUTTON_TRAY_H_

OLD	NEW