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

Side by Side Diff: chrome/browser/ui/cocoa/profiles/user_manager_mac_unittest.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, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/cocoa/profiles/user_manager_mac.h" 5 #include "chrome/browser/ui/cocoa/profiles/user_manager_mac.h"
6 6
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "chrome/browser/profiles/profile_window.h" 8 #include "chrome/browser/profiles/profile_window.h"
9 #include "chrome/browser/ui/user_manager.h"
9 #include "chrome/test/base/browser_with_test_window_test.h" 10 #include "chrome/test/base/browser_with_test_window_test.h"
10 #include "chrome/test/base/testing_browser_process.h" 11 #include "chrome/test/base/testing_browser_process.h"
11 #include "chrome/test/base/testing_profile_manager.h" 12 #include "chrome/test/base/testing_profile_manager.h"
12 13
13 class UserManagerMacTest : public BrowserWithTestWindowTest { 14 class UserManagerMacTest : public BrowserWithTestWindowTest {
14 public: 15 public:
15 UserManagerMacTest() 16 UserManagerMacTest()
16 : testing_profile_manager_(TestingBrowserProcess::GetGlobal()) { 17 : testing_profile_manager_(TestingBrowserProcess::GetGlobal()) {
17 } 18 }
18 19
(...skipping 12 matching lines...) Expand all
31 BrowserWithTestWindowTest::TearDown(); 32 BrowserWithTestWindowTest::TearDown();
32 } 33 }
33 34
34 private: 35 private:
35 TestingProfileManager testing_profile_manager_; 36 TestingProfileManager testing_profile_manager_;
36 37
37 DISALLOW_COPY_AND_ASSIGN(UserManagerMacTest); 38 DISALLOW_COPY_AND_ASSIGN(UserManagerMacTest);
38 }; 39 };
39 40
40 TEST_F(UserManagerMacTest, ShowUserManager) { 41 TEST_F(UserManagerMacTest, ShowUserManager) {
41 EXPECT_FALSE(UserManagerMac::IsShowing()); 42 EXPECT_FALSE(UserManager::IsShowing());
42 UserManagerMac::Show(base::FilePath(), profiles::USER_MANAGER_NO_TUTORIAL); 43 UserManager::Show(base::FilePath(),
43 EXPECT_TRUE(UserManagerMac::IsShowing()); 44 profiles::USER_MANAGER_NO_TUTORIAL,
45 profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
46 EXPECT_TRUE(UserManager::IsShowing());
44 47
45 UserManagerMac::Hide(); 48 UserManager::Hide();
46 EXPECT_FALSE(UserManagerMac::IsShowing()); 49 EXPECT_FALSE(UserManager::IsShowing());
47 } 50 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/profiles/user_manager_mac.mm ('k') | chrome/browser/ui/startup/startup_browser_creator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698