Don't treat policy installed apps as user initiated.

On Mac, if a shortcut is created with a user initiated reason we
highlight the created shortcut in Finder. When an app is installed via
enterprise policy this should not be considered user initiated.

Bug: 1249771
Change-Id: I29e7c9d23c6cb1f3f5375d7517e66d3c1695a76d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3894793
Reviewed-by: Daniel Murphy <[email protected]>
Reviewed-by: Phillis Tang <[email protected]>
Commit-Queue: Marijn Kruisselbrink <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1047648}

Author: mkruisselbrink

Diff for: chrome/browser/web_applications/commands/run_on_os_login_command.cc

@@ -203,6 +203,7 @@ void RunOnOsLoginCommand::UpdateRunOnOsLoginModeWithOsIntegration() {
   } else {
     web_app::InstallOsHooksOptions install_options;
     install_options.os_hooks[web_app::OsHookType::kRunOnOsLogin] = true;
+    install_options.reason = SHORTCUT_CREATION_AUTOMATED;
     os_integration_manager_->InstallOsHooks(
         app_id_,
         base::BindOnce(&RunOnOsLoginCommand::OnOsHooksSet,

Diff for: chrome/browser/web_applications/os_integration/os_integration_manager.cc

@@ -219,7 +219,7 @@ void OsIntegrationManager::InstallOsHooks(
   // TODO(ortuno): Make adding a shortcut to the applications menu independent
   // from adding a shortcut to desktop.
   if (options.os_hooks[OsHookType::kShortcuts]) {
-    CreateShortcuts(app_id, options.add_to_desktop,
+    CreateShortcuts(app_id, options.add_to_desktop, options.reason,
                     std::move(shortcuts_callback));
   } else {
     base::SequencedTaskRunnerHandle::Get()->PostTask(
@@ -414,9 +414,10 @@ FakeOsIntegrationManager* OsIntegrationManager::AsTestOsIntegrationManager() {
 
 void OsIntegrationManager::CreateShortcuts(const AppId& app_id,
                                            bool add_to_desktop,
+                                           ShortcutCreationReason reason,
                                            CreateShortcutsCallback callback) {
   if (shortcut_manager_->CanCreateShortcuts()) {
-    shortcut_manager_->CreateShortcuts(app_id, add_to_desktop,
+    shortcut_manager_->CreateShortcuts(app_id, add_to_desktop, reason,
                                        std::move(callback));
   } else {
     std::move(callback).Run(false);

Diff for: chrome/browser/web_applications/os_integration/os_integration_manager.h

@@ -59,6 +59,7 @@ struct InstallOsHooksOptions {
   OsHooksOptions os_hooks;
   bool add_to_desktop = false;
   bool add_to_quick_launch_bar = false;
+  ShortcutCreationReason reason = SHORTCUT_CREATION_BY_USER;
 };
 
 // Retire these 3 once the sub-manager project is done.
@@ -235,6 +236,7 @@ class OsIntegrationManager : public AppRegistrarObserver {
 
   virtual void CreateShortcuts(const AppId& app_id,
                                bool add_to_desktop,
+                               ShortcutCreationReason reason,
                                CreateShortcutsCallback callback);
 
   // Installation:

Diff for: chrome/browser/web_applications/os_integration/os_integration_manager_unittest.cc

@@ -80,11 +80,13 @@ TEST_F(OsIntegrationManagerTest, InstallOsHooksOnlyShortcuts) {
 
   testing::StrictMock<MockOsIntegrationManager> manager;
   EXPECT_CALL(manager, MacAppShimOnAppInstalledForProfile(app_id)).Times(1);
-  EXPECT_CALL(manager, CreateShortcuts(app_id, false, testing::_))
-      .WillOnce(base::test::RunOnceCallback<2>(true));
+  EXPECT_CALL(manager, CreateShortcuts(app_id, false,
+                                       SHORTCUT_CREATION_AUTOMATED, testing::_))
+      .WillOnce(base::test::RunOnceCallback<3>(true));
 
   InstallOsHooksOptions options;
   options.os_hooks[OsHookType::kShortcuts] = true;
+  options.reason = SHORTCUT_CREATION_AUTOMATED;
   manager.InstallOsHooks(app_id, std::move(callback), nullptr, options);
   run_loop.Run();
   EXPECT_FALSE(install_errors[OsHookType::kShortcuts]);
@@ -106,8 +108,9 @@ TEST_F(OsIntegrationManagerTest, InstallOsHooksEverything) {
   // added here.
   testing::StrictMock<MockOsIntegrationManager> manager;
   EXPECT_CALL(manager, MacAppShimOnAppInstalledForProfile(app_id)).Times(1);
-  EXPECT_CALL(manager, CreateShortcuts(app_id, true, testing::_))
-      .WillOnce(base::test::RunOnceCallback<2>(true));
+  EXPECT_CALL(manager, CreateShortcuts(app_id, true, SHORTCUT_CREATION_BY_USER,
+                                       testing::_))
+      .WillOnce(base::test::RunOnceCallback<3>(true));
   EXPECT_CALL(manager, RegisterFileHandlers(app_id, testing::_)).Times(1);
   EXPECT_CALL(manager, RegisterProtocolHandlers(app_id, testing::_)).Times(1);
   EXPECT_CALL(manager, RegisterUrlHandlers(app_id, testing::_)).Times(1);
@@ -122,6 +125,7 @@ TEST_F(OsIntegrationManagerTest, InstallOsHooksEverything) {
   InstallOsHooksOptions options;
   options.add_to_desktop = true;
   options.add_to_quick_launch_bar = true;
+  options.reason = SHORTCUT_CREATION_BY_USER;
   // Set all hooks to true.
   options.os_hooks.set();
   manager.InstallOsHooks(app_id, std::move(callback), nullptr, options);

Diff for: chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc

@@ -128,6 +128,7 @@ void WebAppShortcutManager::SuppressShortcutsForTesting() {
 
 void WebAppShortcutManager::CreateShortcuts(const AppId& app_id,
                                             bool add_to_desktop,
+                                            ShortcutCreationReason reason,
                                             CreateShortcutsCallback callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(CanCreateShortcuts());
@@ -136,7 +137,7 @@ void WebAppShortcutManager::CreateShortcuts(const AppId& app_id,
       app_id,
       base::BindOnce(
           &WebAppShortcutManager::OnShortcutInfoRetrievedCreateShortcuts,
-          weak_ptr_factory_.GetWeakPtr(), add_to_desktop,
+          weak_ptr_factory_.GetWeakPtr(), add_to_desktop, reason,
           base::BindOnce(&WebAppShortcutManager::OnShortcutsCreated,
                          weak_ptr_factory_.GetWeakPtr(), app_id,
                          std::move(callback))));
@@ -229,6 +230,7 @@ void WebAppShortcutManager::OnShortcutsDeleted(const AppId& app_id,
 
 void WebAppShortcutManager::OnShortcutInfoRetrievedCreateShortcuts(
     bool add_to_desktop,
+    ShortcutCreationReason reason,
     CreateShortcutsCallback callback,
     std::unique_ptr<ShortcutInfo> info) {
   if (suppress_shortcuts_for_testing_) {
@@ -247,9 +249,9 @@ void WebAppShortcutManager::OnShortcutInfoRetrievedCreateShortcuts(
   locations.on_desktop = add_to_desktop;
   locations.applications_menu_location = APP_MENU_LOCATION_SUBDIR_CHROMEAPPS;
 
-  internals::ScheduleCreatePlatformShortcuts(
-      shortcut_data_dir, locations, SHORTCUT_CREATION_BY_USER, std::move(info),
-      std::move(callback));
+  internals::ScheduleCreatePlatformShortcuts(shortcut_data_dir, locations,
+                                             reason, std::move(info),
+                                             std::move(callback));
 }
 
 void WebAppShortcutManager::OnShortcutsMenuIconsReadRegisterShortcutsMenu(

Diff for: chrome/browser/web_applications/os_integration/web_app_shortcut_manager.h

@@ -59,6 +59,7 @@ class WebAppShortcutManager {
   bool CanCreateShortcuts() const;
   void CreateShortcuts(const AppId& app_id,
                        bool add_to_desktop,
+                       ShortcutCreationReason reason,
                        CreateShortcutsCallback callback);
   // Fetch already-updated shortcut data and deploy to OS integration.
   void UpdateShortcuts(const AppId& app_id,
@@ -129,6 +130,7 @@ class WebAppShortcutManager {
 
   void OnShortcutInfoRetrievedCreateShortcuts(
       bool add_to_desktop,
+      ShortcutCreationReason reason,
       CreateShortcutsCallback callback,
       std::unique_ptr<ShortcutInfo> info);
 

Diff for: chrome/browser/web_applications/test/mock_os_integration_manager.h

@@ -27,6 +27,7 @@ class MockOsIntegrationManager : public OsIntegrationManager {
               CreateShortcuts,
               (const AppId& app_id,
                bool add_to_desktop,
+               ShortcutCreationReason reason,
                CreateShortcutsCallback callback),
               (override));
 

Diff for: chrome/browser/web_applications/web_app_install_finalizer.cc

@@ -519,6 +519,21 @@ void WebAppInstallFinalizer::OnDatabaseCommitCompletedForInstall(
   hooks_options.os_hooks[OsHookType::kFileHandlers] = true;
   hooks_options.os_hooks[OsHookType::kProtocolHandlers] = true;
 
+  switch (finalize_options.source) {
+    case WebAppManagement::kSystem:
+    case WebAppManagement::kPolicy:
+    case WebAppManagement::kDefault:
+      hooks_options.reason = SHORTCUT_CREATION_AUTOMATED;
+      break;
+    case WebAppManagement::kKiosk:
+    case WebAppManagement::kSubApp:
+    case WebAppManagement::kWebAppStore:
+    case WebAppManagement::kSync:
+    case WebAppManagement::kCommandLine:
+      hooks_options.reason = SHORTCUT_CREATION_BY_USER;
+      break;
+  }
+
   os_integration_manager_->InstallOsHooks(
       app_id,
       base::BindOnce(&WebAppInstallFinalizer::OnInstallHooksFinished,