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

Side by Side Diff: chrome/browser/ui/views/profiles/new_avatar_menu_button_browsertest.cc

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 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/chrome_notification_types.h" 8 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/profiles/profile_manager.h" 9 #include "chrome/browser/profiles/profile_manager.h"
10 #include "chrome/browser/profiles/profiles_state.h" 10 #include "chrome/browser/profiles/profiles_state.h"
11 #include "chrome/browser/ui/browser_dialogs.h"
12 #include "chrome/browser/ui/browser_list.h" 11 #include "chrome/browser/ui/browser_list.h"
12 #include "chrome/browser/ui/user_manager.h"
13 #include "chrome/browser/ui/views/frame/browser_view.h" 13 #include "chrome/browser/ui/views/frame/browser_view.h"
14 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h" 14 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
15 #include "chrome/browser/ui/views/profiles/new_avatar_button.h" 15 #include "chrome/browser/ui/views/profiles/new_avatar_button.h"
16 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h" 16 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
17 #include "chrome/browser/ui/views/profiles/user_manager_view.h" 17 #include "chrome/browser/ui/views/profiles/user_manager_view.h"
18 #include "chrome/common/chrome_paths.h" 18 #include "chrome/common/chrome_paths.h"
19 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
20 #include "chrome/test/base/in_process_browser_test.h" 20 #include "chrome/test/base/in_process_browser_test.h"
21 #include "chrome/test/base/test_switches.h" 21 #include "chrome/test/base/test_switches.h"
22 #include "chrome/test/base/testing_browser_process.h" 22 #include "chrome/test/base/testing_browser_process.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(), 0, 0); 125 ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(), 0, 0);
126 ProfileChooserView::profile_bubble_->ButtonPressed( 126 ProfileChooserView::profile_bubble_->ButtonPressed(
127 ProfileChooserView::profile_bubble_->lock_button_, mouse_ev); 127 ProfileChooserView::profile_bubble_->lock_button_, mouse_ev);
128 128
129 EXPECT_TRUE(menu->GetItemAt(menu->GetActiveProfileIndex()).signin_required); 129 EXPECT_TRUE(menu->GetItemAt(menu->GetActiveProfileIndex()).signin_required);
130 130
131 window_close_observer.Wait(); // Rely on test timeout for failure indication. 131 window_close_observer.Wait(); // Rely on test timeout for failure indication.
132 EXPECT_TRUE(browser_list->empty()); 132 EXPECT_TRUE(browser_list->empty());
133 133
134 // If the User Manager hasn't shown yet, wait for it to show up. 134 // If the User Manager hasn't shown yet, wait for it to show up.
135 if (!UserManagerView::IsShowing()) 135 if (!UserManager::IsShowing())
136 base::MessageLoop::current()->RunUntilIdle(); 136 base::MessageLoop::current()->RunUntilIdle();
137 137
138 // We need to hide the User Manager or else the process can't die. 138 // We need to hide the User Manager or else the process can't die.
139 chrome::HideUserManager(); 139 UserManager::Hide();
140 } 140 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/user_manager.h ('k') | chrome/browser/ui/views/profiles/profile_chooser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698