Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(328)

Unified Diff: ash/common/system/chromeos/session/tray_session_length_limit_unittest.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: 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
Index: ash/common/system/chromeos/session/tray_session_length_limit_unittest.cc
diff --git a/ash/system/chromeos/session/tray_session_length_limit_unittest.cc b/ash/common/system/chromeos/session/tray_session_length_limit_unittest.cc
similarity index 95%
rename from ash/system/chromeos/session/tray_session_length_limit_unittest.cc
rename to ash/common/system/chromeos/session/tray_session_length_limit_unittest.cc
index e69ecff19d92c5c273c31f55787c5a18e05d011b..64132cc308d8424a2edd46cdf75dbdad5e228abe 100644
--- a/ash/system/chromeos/session/tray_session_length_limit_unittest.cc
+++ b/ash/common/system/chromeos/session/tray_session_length_limit_unittest.cc
@@ -2,10 +2,8 @@
// 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 "ash/root_window_controller.h"
-#include "ash/shell.h"
#include "ash/system/tray/system_tray.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/test_system_tray_delegate.h"
@@ -24,8 +22,7 @@ class TraySessionLengthLimitTest : public AshTestBase {
void SetUp() override {
AshTestBase::SetUp();
- SystemTray* system_tray =
- Shell::GetPrimaryRootWindowController()->GetSystemTray();
+ SystemTray* system_tray = GetPrimarySystemTray();
tray_session_length_limit_ = new TraySessionLengthLimit(system_tray);
system_tray->AddTrayItem(tray_session_length_limit_);
}
« no previous file with comments | « ash/common/system/chromeos/session/tray_session_length_limit.cc ('k') | ash/common/system/tray/label_tray_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698