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 #import <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> |
6 #include <vector> | 6 #include <vector> |
7 | 7 |
8 #include "apps/app_lifetime_monitor_factory.h" | 8 #include "apps/app_lifetime_monitor_factory.h" |
9 #include "apps/switches.h" | 9 #include "apps/switches.h" |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
11 #include "base/callback.h" | 11 #include "base/callback.h" |
12 #include "base/files/file_path_watcher.h" | 12 #include "base/files/file_path_watcher.h" |
13 #include "base/mac/foundation_util.h" | 13 #include "base/mac/foundation_util.h" |
14 #include "base/mac/launch_services_util.h" | 14 #include "base/mac/launch_services_util.h" |
15 #include "base/mac/mac_util.h" | 15 #include "base/mac/mac_util.h" |
16 #include "base/mac/scoped_nsobject.h" | 16 #include "base/mac/scoped_nsobject.h" |
| 17 #include "base/macros.h" |
17 #include "base/path_service.h" | 18 #include "base/path_service.h" |
18 #include "base/process/launch.h" | 19 #include "base/process/launch.h" |
19 #include "base/strings/sys_string_conversions.h" | 20 #include "base/strings/sys_string_conversions.h" |
20 #include "base/test/test_timeouts.h" | 21 #include "base/test/test_timeouts.h" |
| 22 #include "build/build_config.h" |
21 #include "chrome/browser/apps/app_browsertest_util.h" | 23 #include "chrome/browser/apps/app_browsertest_util.h" |
22 #include "chrome/browser/apps/app_shim/app_shim_handler_mac.h" | 24 #include "chrome/browser/apps/app_shim/app_shim_handler_mac.h" |
23 #include "chrome/browser/apps/app_shim/app_shim_host_manager_mac.h" | 25 #include "chrome/browser/apps/app_shim/app_shim_host_manager_mac.h" |
24 #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h" | 26 #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h" |
25 #include "chrome/browser/browser_process.h" | 27 #include "chrome/browser/browser_process.h" |
26 #include "chrome/browser/extensions/launch_util.h" | 28 #include "chrome/browser/extensions/launch_util.h" |
27 #include "chrome/browser/profiles/profile.h" | 29 #include "chrome/browser/profiles/profile.h" |
28 #include "chrome/browser/ui/browser_list.h" | 30 #include "chrome/browser/ui/browser_list.h" |
29 #include "chrome/browser/ui/browser_window.h" | 31 #include "chrome/browser/ui/browser_window.h" |
30 #include "chrome/browser/web_applications/web_app_mac.h" | 32 #include "chrome/browser/web_applications/web_app_mac.h" |
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
672 // the shim is rebuilt. | 674 // the shim is rebuilt. |
673 WindowedAppShimLaunchObserver(app->id()).Wait(); | 675 WindowedAppShimLaunchObserver(app->id()).Wait(); |
674 | 676 |
675 EXPECT_TRUE(GetFirstAppWindow()); | 677 EXPECT_TRUE(GetFirstAppWindow()); |
676 EXPECT_TRUE(HasAppShimHost(profile(), app->id())); | 678 EXPECT_TRUE(HasAppShimHost(profile(), app->id())); |
677 } | 679 } |
678 | 680 |
679 #endif // defined(ARCH_CPU_64_BITS) | 681 #endif // defined(ARCH_CPU_64_BITS) |
680 | 682 |
681 } // namespace apps | 683 } // namespace apps |
OLD | NEW |