ash/system/session/logout_confirmation_dialog.cc - Issue 2908333003: [mus+ash] Removes WmWindow from ash (app_list, frame, metrics, session, system, wallpaper)

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/system/session/logout_confirmation_dialog.cc

Issue 2908333003: [mus+ash] Removes WmWindow from ash (app_list, frame, metrics, session, system, wallpaper) (Closed)

Patch Set: [mus ash] Removes WmWindow from ash (rebase, nits and cleanup of use of ResizeHandleWindowTargeter) Created 3 years, 6 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

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/session/logout_confirmation_dialog.h"	5 #include "ash/system/session/logout_confirmation_dialog.h"

6	6

7 #include "ash/public/cpp/shell_window_ids.h"	7 #include "ash/public/cpp/shell_window_ids.h"

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

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

10 #include "ash/strings/grit/ash_strings.h"	10 #include "ash/strings/grit/ash_strings.h"

11 #include "ash/system/session/logout_confirmation_controller.h"	11 #include "ash/system/session/logout_confirmation_controller.h"

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

13 #include "ash/wm_window.h"

14 #include "base/location.h"	13 #include "base/location.h"

15 #include "base/time/tick_clock.h"	14 #include "base/time/tick_clock.h"

16 #include "ui/base/l10n/l10n_util.h"	15 #include "ui/base/l10n/l10n_util.h"

17 #include "ui/base/l10n/time_format.h"	16 #include "ui/base/l10n/time_format.h"

18 #include "ui/base/ui_base_types.h"	17 #include "ui/base/ui_base_types.h"

19 #include "ui/gfx/geometry/rect.h"	18 #include "ui/gfx/geometry/rect.h"

20 #include "ui/gfx/text_constants.h"	19 #include "ui/gfx/text_constants.h"

21 #include "ui/views/border.h"	20 #include "ui/views/border.h"

22 #include "ui/views/controls/label.h"	21 #include "ui/views/controls/label.h"

23 #include "ui/views/layout/fill_layout.h"	22 #include "ui/views/layout/fill_layout.h"

(...skipping 87 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
111 ui::TimeFormat::LENGTH_LONG, 10,	110 ui::TimeFormat::LENGTH_LONG, 10,

112 time_remaining)));	111 time_remaining)));

113 } else {	112 } else {

114 label_->SetText(	113 label_->SetText(

115 l10n_util::GetStringUTF16(IDS_ASH_LOGOUT_CONFIRMATION_WARNING_NOW));	114 l10n_util::GetStringUTF16(IDS_ASH_LOGOUT_CONFIRMATION_WARNING_NOW));

116 update_timer_.Stop();	115 update_timer_.Stop();

117 }	116 }

118 }	117 }

119	118

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

OLD	NEW

« no previous file with comments | « ash/sticky_keys/sticky_keys_overlay_unittest.cc ('k') | ash/system/status_area_widget_delegate.cc » ('j') | no next file with comments »