chrome/browser/ui/startup/startup_browser_creator_browsertest.cc - Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2)

Side by Side Diff: chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review comments (+ a few other cleanups) Created 6 years, 6 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/ui/cocoa/profiles/avatar_icon_controller_unittest.mm ('k') | chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 #include <algorithm>	5 #include <algorithm>

6 #include <string>	6 #include <string>

7	7

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

9 #include "base/files/file_path.h"	9 #include "base/files/file_path.h"

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

11 #include "base/strings/utf_string_conversions.h"	11 #include "base/strings/utf_string_conversions.h"

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

13 #include "chrome/browser/extensions/extension_browsertest.h"	13 #include "chrome/browser/extensions/extension_browsertest.h"

14 #include "chrome/browser/extensions/extension_service.h"	14 #include "chrome/browser/extensions/extension_service.h"

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

16 #include "chrome/browser/first_run/first_run.h"	16 #include "chrome/browser/first_run/first_run.h"

17 #include "chrome/browser/infobars/infobar_service.h"	17 #include "chrome/browser/infobars/infobar_service.h"

18 #include "chrome/browser/managed_mode/managed_mode_navigation_observer.h"

19 #include "chrome/browser/managed_mode/managed_user_service.h"

20 #include "chrome/browser/managed_mode/managed_user_service_factory.h"

21 #include "chrome/browser/prefs/session_startup_pref.h"	18 #include "chrome/browser/prefs/session_startup_pref.h"

22 #include "chrome/browser/profiles/profile.h"	19 #include "chrome/browser/profiles/profile.h"

23 #include "chrome/browser/profiles/profile_impl.h"	20 #include "chrome/browser/profiles/profile_impl.h"

24 #include "chrome/browser/profiles/profile_manager.h"	21 #include "chrome/browser/profiles/profile_manager.h"

25 #include "chrome/browser/sessions/session_restore.h"	22 #include "chrome/browser/sessions/session_restore.h"

26 #include "chrome/browser/signin/signin_promo.h"	23 #include "chrome/browser/signin/signin_promo.h"

	24 #include "chrome/browser/supervised_user/supervised_user_navigation_observer.h"

	25 #include "chrome/browser/supervised_user/supervised_user_service.h"

	26 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"

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

28 #include "chrome/browser/ui/browser_commands.h"	28 #include "chrome/browser/ui/browser_commands.h"

29 #include "chrome/browser/ui/browser_finder.h"	29 #include "chrome/browser/ui/browser_finder.h"

30 #include "chrome/browser/ui/browser_iterator.h"	30 #include "chrome/browser/ui/browser_iterator.h"

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

32 #include "chrome/browser/ui/browser_list_observer.h"	32 #include "chrome/browser/ui/browser_list_observer.h"

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

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

35 #include "chrome/browser/ui/startup/startup_browser_creator.h"	35 #include "chrome/browser/ui/startup/startup_browser_creator.h"

36 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"	36 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"

(...skipping 1397 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1434 ASSERT_EQ(1, tab_strip->count());	1434 ASSERT_EQ(1, tab_strip->count());

1435 EXPECT_EQ("title1.html",	1435 EXPECT_EQ("title1.html",

1436 tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName());	1436 tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName());

1437 }	1437 }

1438 #endif // defined(ENABLE_CONFIGURATION_POLICY)	1438 #endif // defined(ENABLE_CONFIGURATION_POLICY)

1439	1439

1440 #endif // !defined(OS_LINUX) \|\| !defined(GOOGLE_CHROME_BUILD) \|\|	1440 #endif // !defined(OS_LINUX) \|\| !defined(GOOGLE_CHROME_BUILD) \|\|

1441 // defined(ENABLE_CONFIGURATION_POLICY)	1441 // defined(ENABLE_CONFIGURATION_POLICY)

1442	1442

1443 #endif // !defined(OS_CHROMEOS)	1443 #endif // !defined(OS_CHROMEOS)

OLD	NEW