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

Unified Diff: chrome/browser/app_controller_mac_browsertest.mm

Issue 564453003: Access to Chrome via the System Tray should go through the User Manager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase continued Created 6 years, 3 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 | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/background/background_mode_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/app_controller_mac_browsertest.mm
diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm
index ffe4b024ea91bbc4ac2e9e7ed9c62d7565df0167..d920ae86e18966f2eeafe06a81cff252adec5648 100644
--- a/chrome/browser/app_controller_mac_browsertest.mm
+++ b/chrome/browser/app_controller_mac_browsertest.mm
@@ -21,9 +21,9 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window.h"
-#import "chrome/browser/ui/cocoa/profiles/user_manager_mac.h"
#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/user_manager.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
@@ -222,7 +222,7 @@ IN_PROC_BROWSER_TEST_F(AppControllerNewProfileManagementBrowserTest,
EXPECT_FALSE(result);
EXPECT_EQ(2u, active_browser_list_->size());
- EXPECT_FALSE(UserManagerMac::IsShowing());
+ EXPECT_FALSE(UserManager::IsShowing());
}
// Test that for a locked last profile, a reopen event opens the User Manager.
@@ -248,8 +248,8 @@ IN_PROC_BROWSER_TEST_F(AppControllerNewProfileManagementBrowserTest,
base::RunLoop().RunUntilIdle();
EXPECT_EQ(1u, active_browser_list_->size());
- EXPECT_TRUE(UserManagerMac::IsShowing());
- UserManagerMac::Hide();
+ EXPECT_TRUE(UserManager::IsShowing());
+ UserManager::Hide();
}
// Test that for a guest last profile, a reopen event opens the User Manager.
@@ -274,8 +274,8 @@ IN_PROC_BROWSER_TEST_F(AppControllerNewProfileManagementBrowserTest,
base::RunLoop().RunUntilIdle();
EXPECT_EQ(1u, active_browser_list_->size());
- EXPECT_TRUE(UserManagerMac::IsShowing());
- UserManagerMac::Hide();
+ EXPECT_TRUE(UserManager::IsShowing());
+ UserManager::Hide();
}
class AppControllerOpenShortcutBrowserTest : public InProcessBrowserTest {
« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/background/background_mode_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698