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

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

Unified Diff: ash/common/system/chromeos/session/logout_confirmation_dialog.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, 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « ash/common/system/chromeos/session/logout_confirmation_controller_unittest.cc ('k') | ash/common/system/chromeos/session/logout_confirmation_dialog.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/common/system/chromeos/session/logout_confirmation_dialog.h

diff --git a/ash/system/chromeos/session/logout_confirmation_dialog.h b/ash/common/system/chromeos/session/logout_confirmation_dialog.h

similarity index 86%

rename from ash/system/chromeos/session/logout_confirmation_dialog.h

rename to ash/common/system/chromeos/session/logout_confirmation_dialog.h

index d9d2c3d39b0afce235072473cf245864eaf98f03..fa3c4d42d352ca5cc673487f517afb0a9a807d66 100644

--- a/ash/system/chromeos/session/logout_confirmation_dialog.h

+++ b/ash/common/system/chromeos/session/logout_confirmation_dialog.h

@@ -2,10 +2,9 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#ifndef ASH_SYSTEM_CHROMEOS_SESSION_LOGOUT_CONFIRMATION_DIALOG_H_

-#define ASH_SYSTEM_CHROMEOS_SESSION_LOGOUT_CONFIRMATION_DIALOG_H_

+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_SESSION_LOGOUT_CONFIRMATION_DIALOG_H_

+#define ASH_COMMON_SYSTEM_CHROMEOS_SESSION_LOGOUT_CONFIRMATION_DIALOG_H_

-#include "base/compiler_specific.h"

#include "base/macros.h"

#include "base/time/time.h"

#include "base/timer/timer.h"

@@ -55,4 +54,4 @@ class LogoutConfirmationDialog : public views::DialogDelegateView {

} // namespace ash

-#endif // ASH_SYSTEM_CHROMEOS_SESSION_LOGOUT_CONFIRMATION_DIALOG_H_

+#endif // ASH_COMMON_SYSTEM_CHROMEOS_SESSION_LOGOUT_CONFIRMATION_DIALOG_H_