chrome/browser/chromeos/login/kiosk_browsertest.cc - Issue 606953002: Move components/native_app_window to extensions/components/native_app_window

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

Issue 606953002: Move components/native_app_window to extensions/components/native_app_window (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: respond to comments Created 6 years, 2 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

« no previous file with comments | « chrome/browser/chromeos/login/DEPS ('k') | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »

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 "ash/desktop_background/desktop_background_controller.h"	5 #include "ash/desktop_background/desktop_background_controller.h"

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

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

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

9 #include "base/bind_helpers.h"	9 #include "base/bind_helpers.h"

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

(...skipping 28 matching lines...) Expand all Loading...
39 #include "chrome/browser/profiles/profile_impl.h"	39 #include "chrome/browser/profiles/profile_impl.h"

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

41 #include "chrome/browser/profiles/profiles_state.h"	41 #include "chrome/browser/profiles/profiles_state.h"

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

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

44 #include "chrome/common/chrome_paths.h"	44 #include "chrome/common/chrome_paths.h"

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

46 #include "chromeos/chromeos_switches.h"	46 #include "chromeos/chromeos_switches.h"

47 #include "chromeos/dbus/cryptohome_client.h"	47 #include "chromeos/dbus/cryptohome_client.h"

48 #include "chromeos/disks/disk_mount_manager.h"	48 #include "chromeos/disks/disk_mount_manager.h"

49 #include "components/native_app_window/native_app_window_views.h"

50 #include "components/signin/core/common/signin_pref_names.h"	49 #include "components/signin/core/common/signin_pref_names.h"

51 #include "content/public/browser/browser_thread.h"	50 #include "content/public/browser/browser_thread.h"

52 #include "content/public/browser/notification_observer.h"	51 #include "content/public/browser/notification_observer.h"

53 #include "content/public/browser/notification_registrar.h"	52 #include "content/public/browser/notification_registrar.h"

54 #include "content/public/browser/notification_service.h"	53 #include "content/public/browser/notification_service.h"

55 #include "content/public/test/browser_test_utils.h"	54 #include "content/public/test/browser_test_utils.h"

56 #include "extensions/browser/app_window/app_window.h"	55 #include "extensions/browser/app_window/app_window.h"

57 #include "extensions/browser/app_window/app_window_registry.h"	56 #include "extensions/browser/app_window/app_window_registry.h"

58 #include "extensions/browser/app_window/native_app_window.h"	57 #include "extensions/browser/app_window/native_app_window.h"

59 #include "extensions/browser/extension_system.h"	58 #include "extensions/browser/extension_system.h"

	59 #include "extensions/components/native_app_window/native_app_window_views.h"

60 #include "extensions/test/extension_test_message_listener.h"	60 #include "extensions/test/extension_test_message_listener.h"

61 #include "extensions/test/result_catcher.h"	61 #include "extensions/test/result_catcher.h"

62 #include "google_apis/gaia/gaia_constants.h"	62 #include "google_apis/gaia/gaia_constants.h"

63 #include "google_apis/gaia/gaia_switches.h"	63 #include "google_apis/gaia/gaia_switches.h"

64 #include "google_apis/gaia/gaia_urls.h"	64 #include "google_apis/gaia/gaia_urls.h"

65 #include "net/test/embedded_test_server/embedded_test_server.h"	65 #include "net/test/embedded_test_server/embedded_test_server.h"

66 #include "ui/base/accelerators/accelerator.h"	66 #include "ui/base/accelerators/accelerator.h"

67	67

68 namespace em = enterprise_management;	68 namespace em = enterprise_management;

69	69

(...skipping 1703 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1773 content::WindowedNotificationObserver(	1773 content::WindowedNotificationObserver(

1774 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,	1774 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,

1775 content::NotificationService::AllSources()).Wait();	1775 content::NotificationService::AllSources()).Wait();

1776	1776

1777 // Wait for the wallpaper to load.	1777 // Wait for the wallpaper to load.

1778 WaitForWallpaper();	1778 WaitForWallpaper();

1779 EXPECT_TRUE(wallpaper_loaded());	1779 EXPECT_TRUE(wallpaper_loaded());

1780 }	1780 }

1781	1781

1782 } // namespace chromeos	1782 } // namespace chromeos

OLD	NEW