chrome/browser/chromeos/login/kiosk_browsertest.cc - Issue 495563003: Move ParallelAuthnticator to chromeos and rename it to CryptohomeAuthenticator

Side by Side Diff: chrome/browser/chromeos/login/kiosk_browsertest.cc

Issue 495563003: Move ParallelAuthnticator to chromeos and rename it to CryptohomeAuthenticator (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 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

« chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h ('K') | « chrome/browser/chromeos/login/auth/parallel_authenticator_unittest.cc ('k') | chrome/browser/chromeos/login/login_utils.cc » ('j') | chromeos/login/auth/cryptohome_authenticator.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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 "apps/app_window.h"	5 #include "apps/app_window.h"

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

7 #include "ash/desktop_background/desktop_background_controller.h"	7 #include "ash/desktop_background/desktop_background_controller.h"

8 #include "ash/desktop_background/desktop_background_controller_observer.h"	8 #include "ash/desktop_background/desktop_background_controller_observer.h"

9 #include "ash/shell.h"	9 #include "ash/shell.h"

10 #include "base/file_util.h"	10 #include "base/file_util.h"

(...skipping 16 matching lines...) Expand all Loading...
27 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"	27 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"

28 #include "chrome/browser/chromeos/login/wizard_controller.h"	28 #include "chrome/browser/chromeos/login/wizard_controller.h"

29 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"	29 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"

30 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"	30 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"

31 #include "chrome/browser/chromeos/profiles/profile_helper.h"	31 #include "chrome/browser/chromeos/profiles/profile_helper.h"

32 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"	32 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"

33 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h "	33 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h "

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

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

36 #include "chrome/browser/profiles/profile_impl.h"	36 #include "chrome/browser/profiles/profile_impl.h"

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

37 #include "chrome/browser/profiles/profiles_state.h"	38 #include "chrome/browser/profiles/profiles_state.h"

38 #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h"	39 #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h"

39 #include "chrome/common/chrome_constants.h"	40 #include "chrome/common/chrome_constants.h"

40 #include "chrome/common/chrome_paths.h"	41 #include "chrome/common/chrome_paths.h"

41 #include "chrome/common/pref_names.h"	42 #include "chrome/common/pref_names.h"

42 #include "chromeos/chromeos_switches.h"	43 #include "chromeos/chromeos_switches.h"

43 #include "chromeos/dbus/cryptohome_client.h"	44 #include "chromeos/dbus/cryptohome_client.h"

44 #include "components/signin/core/common/signin_pref_names.h"	45 #include "components/signin/core/common/signin_pref_names.h"

45 #include "content/public/browser/notification_observer.h"	46 #include "content/public/browser/notification_observer.h"

46 #include "content/public/browser/notification_registrar.h"	47 #include "content/public/browser/notification_registrar.h"

(...skipping 1325 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1372 content::WindowedNotificationObserver(	1373 content::WindowedNotificationObserver(

1373 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,	1374 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,

1374 content::NotificationService::AllSources()).Wait();	1375 content::NotificationService::AllSources()).Wait();

1375	1376

1376 // Wait for the wallpaper to load.	1377 // Wait for the wallpaper to load.

1377 WaitForWallpaper();	1378 WaitForWallpaper();

1378 EXPECT_TRUE(wallpaper_loaded());	1379 EXPECT_TRUE(wallpaper_loaded());

1379 }	1380 }

1380	1381

1381 } // namespace chromeos	1382 } // namespace chromeos

OLD	NEW