| OLD | NEW |
| 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/views/profiles/profile_chooser_view.h" | 5 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 IN_PROC_BROWSER_TEST_F(ProfileChooserViewExtensionsTest, | 205 IN_PROC_BROWSER_TEST_F(ProfileChooserViewExtensionsTest, |
| 206 NoProfileChooserOnOutsideUserDataDirProfiles) { | 206 NoProfileChooserOnOutsideUserDataDirProfiles) { |
| 207 // Test that the profile chooser view does not show when avatar menu is not | 207 // Test that the profile chooser view does not show when avatar menu is not |
| 208 // available. This can be repro'ed with a profile path outside user_data_dir. | 208 // available. This can be repro'ed with a profile path outside user_data_dir. |
| 209 // crbug.com/527505 | 209 // crbug.com/527505 |
| 210 Profile* new_profile = CreateProfileOutsideUserDataDir(); | 210 Profile* new_profile = CreateProfileOutsideUserDataDir(); |
| 211 Browser* browser = CreateBrowser(new_profile); | 211 Browser* browser = CreateBrowser(new_profile); |
| 212 browser->window()->ShowAvatarBubbleFromAvatarButton( | 212 browser->window()->ShowAvatarBubbleFromAvatarButton( |
| 213 BrowserWindow::AVATAR_BUBBLE_MODE_CONFIRM_SIGNIN, | 213 BrowserWindow::AVATAR_BUBBLE_MODE_CONFIRM_SIGNIN, |
| 214 signin::ManageAccountsParams(), | 214 signin::ManageAccountsParams(), |
| 215 signin_metrics::AccessPoint::ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN); | 215 signin_metrics::AccessPoint::ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN, false); |
| 216 ASSERT_FALSE(ProfileChooserView::IsShowing()); | 216 ASSERT_FALSE(ProfileChooserView::IsShowing()); |
| 217 CloseBrowserSynchronously(browser); | 217 CloseBrowserSynchronously(browser); |
| 218 } | 218 } |
| 219 | 219 |
| 220 IN_PROC_BROWSER_TEST_F(ProfileChooserViewExtensionsTest, SigninButtonHasFocus) { | 220 IN_PROC_BROWSER_TEST_F(ProfileChooserViewExtensionsTest, SigninButtonHasFocus) { |
| 221 ASSERT_TRUE(profiles::IsMultipleProfilesEnabled()); | 221 ASSERT_TRUE(profiles::IsMultipleProfilesEnabled()); |
| 222 ASSERT_NO_FATAL_FAILURE(OpenProfileChooserView(browser())); | 222 ASSERT_NO_FATAL_FAILURE(OpenProfileChooserView(browser())); |
| 223 | 223 |
| 224 EXPECT_TRUE(signin_current_profile_button()->HasFocus()); | 224 EXPECT_TRUE(signin_current_profile_button()->HasFocus()); |
| 225 } | 225 } |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 343 // Wait until the user manager is shown. | 343 // Wait until the user manager is shown. |
| 344 runner->Run(); | 344 runner->Run(); |
| 345 | 345 |
| 346 // Assert that the first profile's extensions are not blocked. | 346 // Assert that the first profile's extensions are not blocked. |
| 347 ASSERT_EQ(total_enabled_extensions, registry->enabled_extensions().size()); | 347 ASSERT_EQ(total_enabled_extensions, registry->enabled_extensions().size()); |
| 348 ASSERT_EQ(0U, registry->blocked_extensions().size()); | 348 ASSERT_EQ(0U, registry->blocked_extensions().size()); |
| 349 | 349 |
| 350 // We need to hide the User Manager or else the process can't die. | 350 // We need to hide the User Manager or else the process can't die. |
| 351 UserManager::Hide(); | 351 UserManager::Hide(); |
| 352 } | 352 } |
| OLD | NEW |