chrome/browser/apps/ephemeral_app_launcher_browsertest.cc - Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h

Side by Side Diff: chrome/browser/apps/ephemeral_app_launcher_browsertest.cc

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type

Patch Set: Build fixes for Windows and Mac Created 5 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

« no previous file with comments | « chrome/browser/apps/ephemeral_app_launcher.cc ('k') | chrome/browser/apps/per_app_settings_service.h » ('j') | no next file with comments »

OLD	NEW
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/thread_task_runner_handle.h"	5 #include "base/thread_task_runner_handle.h"

6 #include "chrome/browser/apps/ephemeral_app_launcher.h"	6 #include "chrome/browser/apps/ephemeral_app_launcher.h"

7 #include "chrome/browser/apps/ephemeral_app_service.h"	7 #include "chrome/browser/apps/ephemeral_app_service.h"

8 #include "chrome/browser/extensions/extension_install_checker.h"	8 #include "chrome/browser/extensions/extension_install_checker.h"

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

10 #include "chrome/browser/extensions/install_tracker.h"	10 #include "chrome/browser/extensions/install_tracker.h"

11 #include "chrome/browser/extensions/test_blacklist.h"	11 #include "chrome/browser/extensions/test_blacklist.h"

12 #include "chrome/browser/extensions/webstore_installer_test.h"	12 #include "chrome/browser/extensions/webstore_installer_test.h"

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

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

14 #include "chrome/browser/ui/tabs/tab_strip_model.h"	15 #include "chrome/browser/ui/tabs/tab_strip_model.h"

15 #include "chrome/common/chrome_switches.h"	16 #include "chrome/common/chrome_switches.h"

16 #include "content/public/browser/web_contents.h"	17 #include "content/public/browser/web_contents.h"

17 #include "content/public/test/test_utils.h"	18 #include "content/public/test/test_utils.h"

18 #include "extensions/browser/extension_prefs.h"	19 #include "extensions/browser/extension_prefs.h"

19 #include "extensions/browser/extension_registry.h"	20 #include "extensions/browser/extension_registry.h"

20 #include "extensions/browser/extension_system.h"	21 #include "extensions/browser/extension_system.h"

21 #include "extensions/browser/extension_util.h"	22 #include "extensions/browser/extension_util.h"

22 #include "extensions/browser/management_policy.h"	23 #include "extensions/browser/management_policy.h"

23 #include "extensions/browser/process_manager.h"	24 #include "extensions/browser/process_manager.h"

(...skipping 530 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
554 }	555 }

555	556

556 // Verifies that a launch will fail if a duplicate launch is in progress.	557 // Verifies that a launch will fail if a duplicate launch is in progress.

557 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTest, DuplicateLaunchInProgress) {	558 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTest, DuplicateLaunchInProgress) {

558 extensions::ActiveInstallData install_data(kDefaultAppId);	559 extensions::ActiveInstallData install_data(kDefaultAppId);

559 install_data.is_ephemeral = true;	560 install_data.is_ephemeral = true;

560 InstallTracker::Get(profile())->AddActiveInstall(install_data);	561 InstallTracker::Get(profile())->AddActiveInstall(install_data);

561	562

562 RunLaunchTest(kDefaultAppId, webstore_install::LAUNCH_IN_PROGRESS, false);	563 RunLaunchTest(kDefaultAppId, webstore_install::LAUNCH_IN_PROGRESS, false);

563 }	564 }

OLD	NEW