Skip to content

GitLab

T
tangled
Commit ad61a83a authored by Christopher Cameron's avatar Christopher Cameron Committed by Commit Bot
Browse files
Options

MacPWAs BMO: Cut extensions, platform_apps out of app_shim 

With this in place, we can call AppShimRegistry from
BookmarkAppShortcutManager instead of AppShortcutManager.

Note that some tests are built around extensions, and will
need to be substantially modified. Those are moved to
platform_apps, because the new bookmark-based versions will
continue to exist alongside the old extensions-based
versions.

R=loyso
TBR=avi (chrome/)

Bug: 1057195
Change-Id: I4784eedcb270fb679e12375d3a729107ada37f11
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2109272
Commit-Queue: ccameron <ccameron@chromium.org>
Reviewed-by: default avatarAlexey Baskakov <loyso@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751930}
parent d1e339e3
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 52 deletions
chrome/browser/apps/app_shim/BUILD.gn
View file @ ad61a83a
...@@ -14,20 +14,17 @@ source_set("app_shim") { ...@@ -14,20 +14,17 @@ source_set("app_shim") {
"app_shim_listener.mm", "app_shim_listener.mm",
"app_shim_manager_mac.cc", "app_shim_manager_mac.cc",
"app_shim_manager_mac.h", "app_shim_manager_mac.h",
"app_shim_registry_mac.cc",
"app_shim_registry_mac.h",
"app_shim_termination_manager.cc", "app_shim_termination_manager.cc",
"app_shim_termination_manager.h", "app_shim_termination_manager.h",
"extension_app_shim_manager_delegate_mac.cc",
"extension_app_shim_manager_delegate_mac.h",
"mach_bootstrap_acceptor.cc", "mach_bootstrap_acceptor.cc",
"mach_bootstrap_acceptor.h", "mach_bootstrap_acceptor.h",
] ]
deps = [ deps = [
"//apps", "//apps",
"//chrome/browser/apps/platform_apps",
"//chrome/browser/extensions",
"//chrome/browser/web_applications/components", "//chrome/browser/web_applications/components",
"//chrome/browser/web_applications/extensions",
"//chrome/common", "//chrome/common",
"//chrome/common:app_mode_app_support", "//chrome/common:app_mode_app_support",
"//chrome/common:constants", "//chrome/common:constants",
...@@ -38,8 +35,7 @@ source_set("app_shim") { ...@@ -38,8 +35,7 @@ source_set("app_shim") {
"//components/version_info", "//components/version_info",
"//content/public/browser", "//content/public/browser",
"//content/public/common", "//content/public/common",
"//extensions/browser", "//services/preferences/public/cpp:cpp",
"//extensions/common",
"//ui/views:views", "//ui/views:views",
] ]
} }
chrome/browser/apps/app_shim/app_shim_manager_mac.cc
View file @ ad61a83a
...@@ -24,9 +24,8 @@ ...@@ -24,9 +24,8 @@
#include "chrome/browser/apps/app_shim/app_shim_host_bootstrap_mac.h" #include "chrome/browser/apps/app_shim/app_shim_host_bootstrap_mac.h"
#include "chrome/browser/apps/app_shim/app_shim_host_mac.h" #include "chrome/browser/apps/app_shim/app_shim_host_mac.h"
#include "chrome/browser/apps/app_shim/app_shim_listener.h" #include "chrome/browser/apps/app_shim/app_shim_listener.h"
#include "chrome/browser/apps/app_shim/app_shim_registry_mac.h"
#include "chrome/browser/apps/app_shim/app_shim_termination_manager.h" #include "chrome/browser/apps/app_shim/app_shim_termination_manager.h"
#include "chrome/browser/apps/app_shim/extension_app_shim_manager_delegate_mac.h"
#include "chrome/browser/apps/platform_apps/app_shim_registry_mac.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h" #include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chrome_notification_types.h"
......
chrome/browser/apps/app_shim/app_shim_manager_mac_unittest.cc
View file @ ad61a83a
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "base/test/mock_callback.h" #include "base/test/mock_callback.h"
#include "chrome/browser/apps/app_shim/app_shim_host_bootstrap_mac.h" #include "chrome/browser/apps/app_shim/app_shim_host_bootstrap_mac.h"
#include "chrome/browser/apps/app_shim/app_shim_host_mac.h" #include "chrome/browser/apps/app_shim/app_shim_host_mac.h"
#include "chrome/browser/apps/platform_apps/app_shim_registry_mac.h" #include "chrome/browser/apps/app_shim/app_shim_registry_mac.h"
#include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/profiles/avatar_menu.h" #include "chrome/browser/profiles/avatar_menu.h"
#include "chrome/common/mac/app_shim.mojom.h" #include "chrome/common/mac/app_shim.mojom.h"
......
chrome/browser/apps/platform_apps/app_shim_registry_mac.cc → chrome/browser/apps/app_shim/app_shim_registry_mac.cc
View file @ ad61a83a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/apps/platform_apps/app_shim_registry_mac.h" #include "chrome/browser/apps/app_shim/app_shim_registry_mac.h"
#include <memory> #include <memory>
#include <utility> #include <utility>
......
chrome/browser/apps/platform_apps/app_shim_registry_mac.h → chrome/browser/apps/app_shim/app_shim_registry_mac.h
View file @ ad61a83a
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_BROWSER_APPS_PLATFORM_APPS_APP_SHIM_REGISTRY_MAC_H_ #ifndef CHROME_BROWSER_APPS_APP_SHIM_APP_SHIM_REGISTRY_MAC_H_
#define CHROME_BROWSER_APPS_PLATFORM_APPS_APP_SHIM_REGISTRY_MAC_H_ #define CHROME_BROWSER_APPS_APP_SHIM_APP_SHIM_REGISTRY_MAC_H_
#include <set> #include <set>
#include <string> #include <string>
...@@ -96,4 +96,4 @@ class AppShimRegistry { ...@@ -96,4 +96,4 @@ class AppShimRegistry {
base::FilePath override_user_data_dir_; base::FilePath override_user_data_dir_;
}; };
#endif // CHROME_BROWSER_APPS_PLATFORM_APPS_APP_SHIM_REGISTRY_MAC_H_ #endif // CHROME_BROWSER_APPS_APP_SHIM_APP_SHIM_REGISTRY_MAC_H_
chrome/browser/apps/platform_apps/app_shim_registry_mac_unittest.cc → chrome/browser/apps/app_shim/app_shim_registry_mac_unittest.cc
View file @ ad61a83a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/apps/platform_apps/app_shim_registry_mac.h" #include "chrome/browser/apps/app_shim/app_shim_registry_mac.h"
#include "chrome/browser/apps/app_shim/app_shim_manager_mac.h" #include "chrome/browser/apps/app_shim/app_shim_manager_mac.h"
#include "components/prefs/testing_pref_service.h" #include "components/prefs/testing_pref_service.h"
......
chrome/browser/apps/platform_apps/BUILD.gn
View file @ ad61a83a
...@@ -12,8 +12,6 @@ source_set("platform_apps") { ...@@ -12,8 +12,6 @@ source_set("platform_apps") {
"app_load_service.h", "app_load_service.h",
"app_load_service_factory.cc", "app_load_service_factory.cc",
"app_load_service_factory.h", "app_load_service_factory.h",
"app_shim_registry_mac.cc",
"app_shim_registry_mac.h",
"app_termination_observer.cc", "app_termination_observer.cc",
"app_termination_observer.h", "app_termination_observer.h",
"app_window_registry_util.cc", "app_window_registry_util.cc",
...@@ -24,6 +22,8 @@ source_set("platform_apps") { ...@@ -24,6 +22,8 @@ source_set("platform_apps") {
"browser_context_keyed_service_factories.h", "browser_context_keyed_service_factories.h",
"chrome_apps_browser_api_provider.cc", "chrome_apps_browser_api_provider.cc",
"chrome_apps_browser_api_provider.h", "chrome_apps_browser_api_provider.h",
"extension_app_shim_manager_delegate_mac.cc",
"extension_app_shim_manager_delegate_mac.h",
"install_chrome_app.cc", "install_chrome_app.cc",
"install_chrome_app.h", "install_chrome_app.h",
"platform_app_launch.cc", "platform_app_launch.cc",
...@@ -48,6 +48,7 @@ source_set("platform_apps") { ...@@ -48,6 +48,7 @@ source_set("platform_apps") {
"//chrome/app:command_ids", "//chrome/app:command_ids",
"//chrome/browser/extensions", "//chrome/browser/extensions",
"//chrome/browser/media/router/discovery", "//chrome/browser/media/router/discovery",
"//chrome/browser/web_applications/components:components",
"//chrome/browser/web_applications/extensions", "//chrome/browser/web_applications/extensions",
"//chrome/common", "//chrome/common",
"//components/crx_file", "//components/crx_file",
...@@ -64,5 +65,9 @@ source_set("platform_apps") { ...@@ -64,5 +65,9 @@ source_set("platform_apps") {
"//ui/gfx", "//ui/gfx",
] ]
if (is_mac) {
deps += [ "//chrome/browser/apps/app_shim" ]
}
allow_circular_includes_from = [ "//chrome/browser/extensions" ] allow_circular_includes_from = [ "//chrome/browser/extensions" ]
} }
chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm → chrome/browser/apps/platform_apps/app_shim_interactive_uitest_mac.mm
View file @ ad61a83a
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#include "chrome/browser/apps/app_shim/app_shim_host_bootstrap_mac.h" #include "chrome/browser/apps/app_shim/app_shim_host_bootstrap_mac.h"
#include "chrome/browser/apps/app_shim/app_shim_listener.h" #include "chrome/browser/apps/app_shim/app_shim_listener.h"
#include "chrome/browser/apps/app_shim/app_shim_manager_mac.h" #include "chrome/browser/apps/app_shim/app_shim_manager_mac.h"
#include "chrome/browser/apps/app_shim/extension_app_shim_manager_delegate_mac.h"
#include "chrome/browser/apps/platform_apps/app_browsertest_util.h" #include "chrome/browser/apps/platform_apps/app_browsertest_util.h"
#include "chrome/browser/apps/platform_apps/extension_app_shim_manager_delegate_mac.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h" #include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/extensions/launch_util.h" #include "chrome/browser/extensions/launch_util.h"
...@@ -270,7 +270,6 @@ Browser* GetFirstHostedAppWindow() { ...@@ -270,7 +270,6 @@ Browser* GetFirstHostedAppWindow() {
const extensions::Extension* AppShimInteractiveTest::InstallAppWithShim( const extensions::Extension* AppShimInteractiveTest::InstallAppWithShim(
AppType type, AppType type,
const char* name) { const char* name) {
const extensions::Extension* app; const extensions::Extension* app;
switch (type) { switch (type) {
case APP_TYPE_PACKAGED: case APP_TYPE_PACKAGED:
...@@ -378,7 +377,7 @@ IN_PROC_BROWSER_TEST_F(AppShimInteractiveTest, MAYBE_HostedAppLaunch) { ...@@ -378,7 +377,7 @@ IN_PROC_BROWSER_TEST_F(AppShimInteractiveTest, MAYBE_HostedAppLaunch) {
listener.WaitUntilRemoved(); listener.WaitUntilRemoved();
int exit_code; int exit_code;
ASSERT_TRUE(shim_process.WaitForExitWithTimeout( ASSERT_TRUE(shim_process.WaitForExitWithTimeout(
TestTimeouts::action_timeout(), &exit_code)); TestTimeouts::action_timeout(), &exit_code));
EXPECT_FALSE(GetFirstHostedAppWindow()); EXPECT_FALSE(GetFirstHostedAppWindow());
EXPECT_FALSE(HasAppShimHost(profile(), app->id())); EXPECT_FALSE(HasAppShimHost(profile(), app->id()));
...@@ -493,10 +492,11 @@ IN_PROC_BROWSER_TEST_F(AppShimInteractiveTest, MAYBE_ShowWindow) { ...@@ -493,10 +492,11 @@ IN_PROC_BROWSER_TEST_F(AppShimInteractiveTest, MAYBE_ShowWindow) {
// Showing the window causes the shim to launch. // Showing the window causes the shim to launch.
{ {
base::scoped_nsobject<WindowedNSNotificationObserver> base::scoped_nsobject<WindowedNSNotificationObserver> ns_observer(
ns_observer([[WindowedNSNotificationObserver alloc] [[WindowedNSNotificationObserver alloc]
initForWorkspaceNotification:NSWorkspaceDidLaunchApplicationNotification initForWorkspaceNotification:
bundleId:bundle_id]); NSWorkspaceDidLaunchApplicationNotification
bundleId:bundle_id]);
WindowedAppShimLaunchObserver observer(app->id()); WindowedAppShimLaunchObserver observer(app->id());
window_1->Show(extensions::AppWindow::SHOW_INACTIVE); window_1->Show(extensions::AppWindow::SHOW_INACTIVE);
EXPECT_TRUE([ns_observer wait]); EXPECT_TRUE([ns_observer wait]);
...@@ -535,10 +535,11 @@ IN_PROC_BROWSER_TEST_F(AppShimInteractiveTest, MAYBE_ShowWindow) { ...@@ -535,10 +535,11 @@ IN_PROC_BROWSER_TEST_F(AppShimInteractiveTest, MAYBE_ShowWindow) {
// Showing one of the windows should launch the shim. // Showing one of the windows should launch the shim.
{ {
base::scoped_nsobject<WindowedNSNotificationObserver> base::scoped_nsobject<WindowedNSNotificationObserver> ns_observer(
ns_observer([[WindowedNSNotificationObserver alloc] [[WindowedNSNotificationObserver alloc]
initForWorkspaceNotification:NSWorkspaceDidLaunchApplicationNotification initForWorkspaceNotification:
bundleId:bundle_id]); NSWorkspaceDidLaunchApplicationNotification
bundleId:bundle_id]);
WindowedAppShimLaunchObserver observer(app->id()); WindowedAppShimLaunchObserver observer(app->id());
window_1->Show(extensions::AppWindow::SHOW_INACTIVE); window_1->Show(extensions::AppWindow::SHOW_INACTIVE);
EXPECT_TRUE([ns_observer wait]); EXPECT_TRUE([ns_observer wait]);
...@@ -610,7 +611,8 @@ IN_PROC_BROWSER_TEST_F(AppShimInteractiveTest, MAYBE_RebuildShim) { ...@@ -610,7 +611,8 @@ IN_PROC_BROWSER_TEST_F(AppShimInteractiveTest, MAYBE_RebuildShim) {
base::FilePath shim_path = updated_paths.front(); base::FilePath shim_path = updated_paths.front();
NSMutableDictionary* plist_64 = [NSMutableDictionary NSMutableDictionary* plist_64 = [NSMutableDictionary
dictionaryWithContentsOfFile:base::mac::FilePathToNSString( dictionaryWithContentsOfFile:base::mac::FilePathToNSString(
shim_path.Append("Contents").Append("Info.plist"))]; shim_path.Append("Contents")
.Append("Info.plist"))];
// Copy 32 bit shim to where it's expected to be. // Copy 32 bit shim to where it's expected to be.
// CopyDirectory doesn't seem to work when copying and renaming in one go. // CopyDirectory doesn't seem to work when copying and renaming in one go.
...@@ -630,17 +632,13 @@ IN_PROC_BROWSER_TEST_F(AppShimInteractiveTest, MAYBE_RebuildShim) { ...@@ -630,17 +632,13 @@ IN_PROC_BROWSER_TEST_F(AppShimInteractiveTest, MAYBE_RebuildShim) {
NSArray* keys_to_copy = @[ NSArray* keys_to_copy = @[
base::mac::CFToNSCast(kCFBundleIdentifierKey), base::mac::CFToNSCast(kCFBundleIdentifierKey),
base::mac::CFToNSCast(kCFBundleNameKey), base::mac::CFToNSCast(kCFBundleNameKey), app_mode::kCrAppModeShortcutIDKey,
app_mode::kCrAppModeShortcutIDKey, app_mode::kCrAppModeUserDataDirKey, app_mode::kBrowserBundleIDKey
app_mode::kCrAppModeUserDataDirKey,
app_mode::kBrowserBundleIDKey
]; ];
for (NSString* key in keys_to_copy) { for (NSString* key in keys_to_copy) {
[plist setObject:[plist_64 objectForKey:key] [plist setObject:[plist_64 objectForKey:key] forKey:key];
forKey:key];
} }
[plist writeToFile:plist_path [plist writeToFile:plist_path atomically:YES];
atomically:YES];
base::mac::RemoveQuarantineAttribute(shim_path); base::mac::RemoveQuarantineAttribute(shim_path);
......
chrome/browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm → chrome/browser/apps/platform_apps/app_shim_quit_interactive_uitest_mac.mm
View file @ ad61a83a
...@@ -91,9 +91,8 @@ class AppShimQuitTest : public PlatformAppBrowserTest { ...@@ -91,9 +91,8 @@ class AppShimQuitTest : public PlatformAppBrowserTest {
void SetUpCommandLine(base::CommandLine* command_line) override { void SetUpCommandLine(base::CommandLine* command_line) override {
PlatformAppBrowserTest::SetUpCommandLine(command_line); PlatformAppBrowserTest::SetUpCommandLine(command_line);
// Simulate an app shim initiated launch, i.e. launch app but not browser. // Simulate an app shim initiated launch, i.e. launch app but not browser.
app_path_ = test_data_dir_ app_path_ =
.AppendASCII("platform_apps") test_data_dir_.AppendASCII("platform_apps").AppendASCII("minimal");
.AppendASCII("minimal");
command_line->AppendSwitchNative(apps::kLoadAndLaunchApp, command_line->AppendSwitchNative(apps::kLoadAndLaunchApp,
app_path_.value()); app_path_.value());
command_line->AppendSwitch(switches::kSilentLaunch); command_line->AppendSwitch(switches::kSilentLaunch);
...@@ -117,8 +116,7 @@ IN_PROC_BROWSER_TEST_F(AppShimQuitTest, QuitWithKeyEvent) { ...@@ -117,8 +116,7 @@ IN_PROC_BROWSER_TEST_F(AppShimQuitTest, QuitWithKeyEvent) {
NSWindow* window = [[NSApp windows] objectAtIndex:0]; NSWindow* window = [[NSApp windows] objectAtIndex:0];
NSEvent* event = cocoa_test_event_utils::KeyEventWithKeyCode( NSEvent* event = cocoa_test_event_utils::KeyEventWithKeyCode(
0, 'q', NSKeyDown, NSCommandKeyMask); 0, 'q', NSKeyDown, NSCommandKeyMask);
[window postEvent:event [window postEvent:event atStart:NO];
atStart:NO];
// This will time out if the event above does not terminate Chrome. // This will time out if the event above does not terminate Chrome.
RunUntilBrowserProcessQuits(); RunUntilBrowserProcessQuits();
......
chrome/browser/apps/app_shim/extension_app_shim_manager_delegate_mac.cc → chrome/browser/apps/platform_apps/extension_app_shim_manager_delegate_mac.cc
View file @ ad61a83a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/apps/app_shim/extension_app_shim_manager_delegate_mac.h" #include "chrome/browser/apps/platform_apps/extension_app_shim_manager_delegate_mac.h"
#include "apps/launcher.h" #include "apps/launcher.h"
#include "chrome/browser/apps/app_shim/app_shim_termination_manager.h" #include "chrome/browser/apps/app_shim/app_shim_termination_manager.h"
......
chrome/browser/apps/app_shim/extension_app_shim_manager_delegate_mac.h → chrome/browser/apps/platform_apps/extension_app_shim_manager_delegate_mac.h
View file @ ad61a83a
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_BROWSER_APPS_APP_SHIM_EXTENSION_APP_SHIM_MANAGER_DELEGATE_MAC_H_ #ifndef CHROME_BROWSER_APPS_PLATFORM_APPS_EXTENSION_APP_SHIM_MANAGER_DELEGATE_MAC_H_
#define CHROME_BROWSER_APPS_APP_SHIM_EXTENSION_APP_SHIM_MANAGER_DELEGATE_MAC_H_ #define CHROME_BROWSER_APPS_PLATFORM_APPS_EXTENSION_APP_SHIM_MANAGER_DELEGATE_MAC_H_
#include "chrome/browser/apps/app_shim/app_shim_manager_mac.h" #include "chrome/browser/apps/app_shim/app_shim_manager_mac.h"
...@@ -51,4 +51,4 @@ class ExtensionAppShimManagerDelegate : public AppShimManager::Delegate { ...@@ -51,4 +51,4 @@ class ExtensionAppShimManagerDelegate : public AppShimManager::Delegate {
} // namespace apps } // namespace apps
#endif // CHROME_BROWSER_APPS_APP_SHIM_EXTENSION_APP_SHIM_MANAGER_DELEGATE_MAC_H_ #endif // CHROME_BROWSER_APPS_PLATFORM_APPS_EXTENSION_APP_SHIM_MANAGER_DELEGATE_MAC_H_
chrome/browser/apps/platform_apps/shortcut_manager.cc
View file @ ad61a83a
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "extensions/common/extension_set.h" #include "extensions/common/extension_set.h"
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
#include "chrome/browser/apps/platform_apps/app_shim_registry_mac.h" #include "chrome/browser/apps/app_shim/app_shim_registry_mac.h"
#include "chrome/common/mac/app_mode_common.h" #include "chrome/common/mac/app_mode_common.h"
#endif #endif
......
chrome/browser/browser_process_platform_part_mac.mm
View file @ ad61a83a
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "base/time/time.h" #include "base/time/time.h"
#import "chrome/browser/app_controller_mac.h" #import "chrome/browser/app_controller_mac.h"
#include "chrome/browser/apps/app_shim/app_shim_manager_mac.h" #include "chrome/browser/apps/app_shim/app_shim_manager_mac.h"
#include "chrome/browser/apps/app_shim/extension_app_shim_manager_delegate_mac.h" #include "chrome/browser/apps/platform_apps/extension_app_shim_manager_delegate_mac.h"
#include "chrome/browser/chrome_browser_application_mac.h" #include "chrome/browser/chrome_browser_application_mac.h"
#include "components/metal_util/test_shader.h" #include "components/metal_util/test_shader.h"
......
chrome/browser/prefs/browser_prefs.cc
View file @ ad61a83a
...@@ -350,7 +350,7 @@ ...@@ -350,7 +350,7 @@
#endif #endif
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
#include "chrome/browser/apps/platform_apps/app_shim_registry_mac.h" #include "chrome/browser/apps/app_shim/app_shim_registry_mac.h"
#include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h"
#include "chrome/browser/ui/cocoa/confirm_quit.h" #include "chrome/browser/ui/cocoa/confirm_quit.h"
#endif #endif
......
chrome/test/BUILD.gn
View file @ ad61a83a
...@@ -4504,7 +4504,7 @@ test("unit_tests") { ...@@ -4504,7 +4504,7 @@ test("unit_tests") {
"../../tools/json_schema_compiler/test/features_generation_unittest.cc", "../../tools/json_schema_compiler/test/features_generation_unittest.cc",
"../browser/apps/app_shim/app_shim_host_mac_unittest.cc", "../browser/apps/app_shim/app_shim_host_mac_unittest.cc",
"../browser/apps/app_shim/app_shim_manager_mac_unittest.cc", "../browser/apps/app_shim/app_shim_manager_mac_unittest.cc",
"../browser/apps/platform_apps/app_shim_registry_mac_unittest.cc", "../browser/apps/app_shim/app_shim_registry_mac_unittest.cc",
"../browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc", "../browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc",
"../browser/browsing_data/counters/hosted_apps_counter_unittest.cc", "../browser/browsing_data/counters/hosted_apps_counter_unittest.cc",
"../browser/extensions/active_tab_unittest.cc", "../browser/extensions/active_tab_unittest.cc",
...@@ -5649,12 +5649,12 @@ if (!is_android) { ...@@ -5649,12 +5649,12 @@ if (!is_android) {
test("interactive_ui_tests") { test("interactive_ui_tests") {
sources = [ sources = [
"../browser/about_flags_browsertest.cc", "../browser/about_flags_browsertest.cc",
"../browser/apps/app_shim/app_shim_interactive_uitest_mac.mm",
"../browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm",
"../browser/apps/guest_view/web_view_interactive_browsertest.cc", "../browser/apps/guest_view/web_view_interactive_browsertest.cc",
"../browser/apps/platform_apps/app_browsertest_util.cc", "../browser/apps/platform_apps/app_browsertest_util.cc",
"../browser/apps/platform_apps/app_browsertest_util.h", "../browser/apps/platform_apps/app_browsertest_util.h",
"../browser/apps/platform_apps/app_pointer_lock_interactive_uitest.cc", "../browser/apps/platform_apps/app_pointer_lock_interactive_uitest.cc",
"../browser/apps/platform_apps/app_shim_interactive_uitest_mac.mm",
"../browser/apps/platform_apps/app_shim_quit_interactive_uitest_mac.mm",
"../browser/apps/platform_apps/app_window_interactive_uitest.cc", "../browser/apps/platform_apps/app_window_interactive_uitest.cc",
"../browser/apps/platform_apps/app_window_interactive_uitest_base.cc", "../browser/apps/platform_apps/app_window_interactive_uitest_base.cc",
"../browser/apps/platform_apps/app_window_interactive_uitest_base.h", "../browser/apps/platform_apps/app_window_interactive_uitest_base.h",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment