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

Unified Diff: chrome/browser/chromeos/policy/device_local_account_browsertest.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
« no previous file with comments | « ash/system/tray/system_tray.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/policy/device_local_account_browsertest.cc
diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
index b1bcf15ccc49973813cb23ee073bc9359f1beda8..76454f0a5f1485c47379ee8649bbbdc0333a3ee3 100644
--- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
@@ -13,9 +13,9 @@
#include <utility>
#include <vector>
-#include "ash/shell.h"
-#include "ash/system/chromeos/session/logout_confirmation_controller.h"
-#include "ash/system/chromeos/session/logout_confirmation_dialog.h"
+#include "ash/common/system/chromeos/session/logout_confirmation_controller.h"
+#include "ash/common/system/chromeos/session/logout_confirmation_dialog.h"
+#include "ash/common/wm_shell.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/callback.h"
@@ -1534,7 +1534,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, LastWindowClosedLogoutReminder) {
// Verify that the logout confirmation dialog is not showing.
ash::LogoutConfirmationController* logout_confirmation_controller =
- ash::Shell::GetInstance()->logout_confirmation_controller();
+ ash::WmShell::Get()->logout_confirmation_controller();
ASSERT_TRUE(logout_confirmation_controller);
EXPECT_FALSE(logout_confirmation_controller->dialog_for_testing());
« no previous file with comments | « ash/system/tray/system_tray.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698