ash/common/system/chromeos/session/tray_session_length_limit.cc - 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/tray_session_length_limit.cc

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: ifdefs 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

« ash/common/system/chromeos/session/logout_confirmation_dialog.cc ('K') | « ash/common/system/chromeos/session/tray_session_length_limit.h ('k') | ash/common/system/chromeos/session/tray_session_length_limit_unittest.cc » ('j') | ash/common/wm_shell.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/common/system/chromeos/session/tray_session_length_limit.cc

diff --git a/ash/system/chromeos/session/tray_session_length_limit.cc b/ash/common/system/chromeos/session/tray_session_length_limit.cc

similarity index 98%

rename from ash/system/chromeos/session/tray_session_length_limit.cc

rename to ash/common/system/chromeos/session/tray_session_length_limit.cc

index e8fc27727da52d96de7baf913fb5ffb2109df327..da59774fd698c3568f6c0eaebfac6a700dce43b7 100644

--- a/ash/system/chromeos/session/tray_session_length_limit.cc

+++ b/ash/common/system/chromeos/session/tray_session_length_limit.cc

@@ -2,17 +2,17 @@

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

// found in the LICENSE file.

-#include "ash/system/chromeos/session/tray_session_length_limit.h"

+#include "ash/common/system/chromeos/session/tray_session_length_limit.h"

#include <algorithm>

#include <memory>

#include <utility>

#include "ash/common/system/system_notifier.h"

+#include "ash/common/system/tray/label_tray_view.h"

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

#include "ash/common/system/tray/system_tray_notifier.h"

#include "ash/common/wm_shell.h"

-#include "ash/system/chromeos/label_tray_view.h"

#include "ash/system/tray/system_tray.h"

#include "base/logging.h"

#include "base/strings/utf_string_conversions.h"