chrome/browser/app_controller_mac_browsertest.mm - Issue 229163004: [Mac] Move profile related UI from cocoa/browser to cocoa/profiles

Side by Side Diff: chrome/browser/app_controller_mac_browsertest.mm

Issue 229163004: [Mac] Move profile related UI from cocoa/browser to cocoa/profiles (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: oops forgot a comment Created 6 years, 8 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/ui/cocoa/browser/avatar_base_controller.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #import <Cocoa/Cocoa.h>	5 #import <Cocoa/Cocoa.h>

6	6

7 #include "apps/app_window_registry.h"	7 #include "apps/app_window_registry.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #include "base/mac/scoped_nsobject.h"	9 #include "base/mac/scoped_nsobject.h"

10 #include "base/prefs/pref_service.h"	10 #include "base/prefs/pref_service.h"

11 #include "chrome/app/chrome_command_ids.h"	11 #include "chrome/app/chrome_command_ids.h"

12 #import "chrome/browser/app_controller_mac.h"	12 #import "chrome/browser/app_controller_mac.h"

13 #include "chrome/browser/apps/app_browsertest_util.h"	13 #include "chrome/browser/apps/app_browsertest_util.h"

14 #include "chrome/browser/browser_process.h"	14 #include "chrome/browser/browser_process.h"

15 #include "chrome/browser/extensions/extension_test_message_listener.h"	15 #include "chrome/browser/extensions/extension_test_message_listener.h"

16 #include "chrome/browser/profiles/profile_manager.h"	16 #include "chrome/browser/profiles/profile_manager.h"

17 #include "chrome/browser/ui/browser.h"	17 #include "chrome/browser/ui/browser.h"

18 #include "chrome/browser/ui/browser_list.h"	18 #include "chrome/browser/ui/browser_list.h"

19 #include "chrome/browser/ui/browser_window.h"	19 #include "chrome/browser/ui/browser_window.h"

20 #import "chrome/browser/ui/cocoa/user_manager_mac.h"	20 #import "chrome/browser/ui/cocoa/profiles/user_manager_mac.h"

21 #include "chrome/browser/ui/host_desktop.h"	21 #include "chrome/browser/ui/host_desktop.h"

22 #include "chrome/browser/ui/tabs/tab_strip_model.h"	22 #include "chrome/browser/ui/tabs/tab_strip_model.h"

23 #include "chrome/common/chrome_constants.h"	23 #include "chrome/common/chrome_constants.h"

24 #include "chrome/common/chrome_switches.h"	24 #include "chrome/common/chrome_switches.h"

25 #include "chrome/common/pref_names.h"	25 #include "chrome/common/pref_names.h"

26 #include "chrome/test/base/in_process_browser_test.h"	26 #include "chrome/test/base/in_process_browser_test.h"

27 #include "chrome/test/base/ui_test_utils.h"	27 #include "chrome/test/base/ui_test_utils.h"

28 #include "content/public/browser/web_contents.h"	28 #include "content/public/browser/web_contents.h"

29 #include "extensions/common/extension.h"	29 #include "extensions/common/extension.h"

30	30

(...skipping 190 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
221 EXPECT_FALSE(result);	221 EXPECT_FALSE(result);

222	222

223 base::RunLoop().RunUntilIdle();	223 base::RunLoop().RunUntilIdle();

224	224

225 EXPECT_EQ(1u, active_browser_list_->size());	225 EXPECT_EQ(1u, active_browser_list_->size());

226 EXPECT_TRUE(UserManagerMac::IsShowing());	226 EXPECT_TRUE(UserManagerMac::IsShowing());

227 UserManagerMac::Hide();	227 UserManagerMac::Hide();

228 }	228 }

229	229

230 } // namespace	230 } // namespace

OLD	NEW