trunk/src/ash/system/date/date_default_view.cc - Issue 260783002: Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..."

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: trunk/src/ash/system/date/date_default_view.cc

Issue 260783002: Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 7 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 | Annotate | Revision Log

« no previous file with comments | « trunk/src/ash/system/chromeos/session/logout_confirmation_controller.cc ('k') | trunk/src/ash/system/tray/default_system_tray_delegate.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 #include "ash/system/date/date_default_view.h"	5 #include "ash/system/date/date_default_view.h"

6	6

7 #include "ash/metrics/user_metrics_recorder.h"	7 #include "ash/metrics/user_metrics_recorder.h"

8 #include "ash/session/session_state_delegate.h"	8 #include "ash/session_state_delegate.h"

9 #include "ash/shell.h"	9 #include "ash/shell.h"

10 #include "ash/system/date/date_view.h"	10 #include "ash/system/date/date_view.h"

11 #include "ash/system/tray/special_popup_row.h"	11 #include "ash/system/tray/special_popup_row.h"

12 #include "ash/system/tray/system_tray_delegate.h"	12 #include "ash/system/tray/system_tray_delegate.h"

13 #include "ash/system/tray/tray_constants.h"	13 #include "ash/system/tray/tray_constants.h"

14 #include "ash/system/tray/tray_popup_header_button.h"	14 #include "ash/system/tray/tray_popup_header_button.h"

15 #include "grit/ash_resources.h"	15 #include "grit/ash_resources.h"

16 #include "grit/ash_strings.h"	16 #include "grit/ash_strings.h"

17 #include "ui/base/l10n/l10n_util.h"	17 #include "ui/base/l10n/l10n_util.h"

18 #include "ui/views/border.h"	18 #include "ui/views/border.h"

(...skipping 92 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
111 tray_delegate->ShutDown();	111 tray_delegate->ShutDown();

112 } else if (sender == lock_) {	112 } else if (sender == lock_) {

113 shell->metrics()->RecordUserMetricsAction(ash::UMA_TRAY_LOCK_SCREEN);	113 shell->metrics()->RecordUserMetricsAction(ash::UMA_TRAY_LOCK_SCREEN);

114 tray_delegate->RequestLockScreen();	114 tray_delegate->RequestLockScreen();

115 } else {	115 } else {

116 NOTREACHED();	116 NOTREACHED();

117 }	117 }

118 }	118 }

119	119

120 } // namespace ash	120 } // namespace ash

OLD	NEW