Revert of Propagate information about how ARC apps are launched

chrome/browser/ui/app_list/arc/arc_app_utils.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 
 #include <memory>
 #include <string>
 
 #include "ash/shell.h"
 #include "base/bind.h"
-#include "base/json/json_writer.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/values.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/common/intent_helper.mojom.h"
 #include "ui/aura/window.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
-#include "ui/events/event_constants.h"
 
 namespace arc {
 
 namespace {
 
 // Default sizes to use.
 constexpr int kNexus7Width = 960;
 constexpr int kNexus7Height = 600;
 constexpr int kNexus5Width = 410;
 constexpr int kNexus5Height = 690;
@@ skipping 10 matching lines @@
 
 // Service name strings.
 constexpr char kCanHandleResolutionStr[] = "get resolution capability";
 constexpr char kCloseTaskStr[] = "close task";
 constexpr char kLaunchAppStr[] = "launch app";
 constexpr char kRemoveIconStr[] = "remove icon";
 constexpr char kSetActiveTaskStr[] = "set active task";
 constexpr char kShowPackageInfoStr[] = "show package info";
 constexpr char kUninstallPackageStr[] = "uninstall package";
 
-// Intent helper strings.
-constexpr char kIntentHelperClassName[] =
-    "org.chromium.arc.intent_helper.SettingsReceiver";
-constexpr char kIntentHelperPackageName[] = "org.chromium.arc.intent_helper";
-constexpr char kSendBroadcastStr[] = "SendBroadcast";
-constexpr char kSetInTouchModeIntent[] =
-    "org.chromium.arc.intent_helper.SET_IN_TOUCH_MODE";
-constexpr char kShowTalkbackSettingsIntent[] =
-    "org.chromium.arc.intent_helper.SHOW_TALKBACK_SETTINGS";
-
 // Helper function which returns the AppInstance. Create related logs when error
 // happens.
 arc::mojom::AppInstance* GetAppInstance(uint32_t required_version,
                                         const std::string& service_name) {
   arc::ArcBridgeService* bridge_service = arc::ArcBridgeService::Get();
   if (!bridge_service) {
     VLOG(2) << "Request to " << service_name
             << " when bridge service is not ready.";
     return nullptr;
   }
 
   return bridge_service->app()->GetInstanceForMethod(service_name.c_str(),
                                                      required_version);
 }
 
-// Helper function which returns the IntentHelperInstance. Create related logs
-// when error happens.
-arc::mojom::IntentHelperInstance* GetIntentHelperInstance(
-    uint32_t required_version,
-    const std::string& service_name) {
-  arc::ArcBridgeService* bridge_service = arc::ArcBridgeService::Get();
-  if (!bridge_service) {
-    VLOG(2) << "Request to " << service_name
-            << " when bridge service is not ready.";
-    return nullptr;
-  }
-
-  return bridge_service->intent_helper()->GetInstanceForMethod(
-      service_name.c_str(), required_version);
-}
-
 void PrioritizeArcInstanceCallback(bool success) {
   VLOG(2) << "Finished prioritizing the instance: result=" << success;
   if (!success)
     LOG(ERROR) << "Failed to prioritize ARC";
 }
 
 // Find a proper size and position for a given rectangle on the screen.
 // TODO(skuhne): This needs more consideration, but it is lacking
 // WindowPositioner functionality since we do not have an Aura::Window yet.
 gfx::Rect GetTargetRect(const gfx::Size& size) {
@@ skipping 17 matching lines @@
   // WindowPositioner::GetDefaultWindowBounds does for now.
   // Note: Android's positioning will not overlap the shelf - as such we can
   // ignore the given workspace inset.
   // TODO(skuhne): Replace this with some more useful logic from the
   // WindowPositioner.
   result.set_x((work_area.width() - result.width()) / 2);
   result.set_y((work_area.height() - result.height()) / 2);
   return result;
 }
 
-// Returns true if |event_flags| came from a mouse or touch event.
-bool IsMouseOrTouchEventFromFlags(int event_flags) {
-  return (event_flags & (ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON |
-                         ui::EF_RIGHT_MOUSE_BUTTON | ui::EF_BACK_MOUSE_BUTTON |
-                         ui::EF_FORWARD_MOUSE_BUTTON | ui::EF_FROM_TOUCH)) != 0;
-}
-
 // A class which handles the asynchronous ARC runtime callback to figure out if
 // an app can handle a certain resolution or not.
 // After LaunchAndRelease() got called, the object will destroy itself once
 // done.
 class LaunchAppWithoutSize {
  public:
   LaunchAppWithoutSize(content::BrowserContext* context,
                        const std::string& app_id,
-                       bool landscape_mode,
-                       int event_flags)
-      : context_(context),
-        app_id_(app_id),
-        landscape_mode_(landscape_mode),
-        event_flags_(event_flags) {}
+                       bool landscape_mode)
+      : context_(context), app_id_(app_id), landscape_mode_(landscape_mode) {}
 
   // This will launch the request and after the return the creator does not
   // need to delete the object anymore.
   bool LaunchAndRelease() {
     landscape_ = landscape_mode_ ? gfx::Rect(0, 0, kNexus7Width, kNexus7Height)
                                  : gfx::Rect(0, 0, kNexus5Width, kNexus5Height);
     if (!ash::Shell::HasInstance()) {
       // Skip this if there is no Ash shell.
-      LaunchAppWithRect(context_, app_id_, landscape_, event_flags_);
+      LaunchAppWithRect(context_, app_id_, landscape_);
       delete this;
       return true;
     }
 
     // TODO(skuhne): Change CanHandleResolution into a call which returns
     // capability flags like [PHONE/TABLET]_[LANDSCAPE/PORTRAIT] and which
     // might also return the used DP->PIX conversion constant to do better
     // size calculations.
     bool result = CanHandleResolution(
         context_, app_id_, landscape_,
         base::Bind(&LaunchAppWithoutSize::Callback, base::Unretained(this)));
     if (!result)
       delete this;
 
     return result;
   }
 
  private:
   content::BrowserContext* context_;
   const std::string app_id_;
   const bool landscape_mode_;
   gfx::Rect landscape_;
-  const int event_flags_;
 
   // The callback handler which gets called from the CanHandleResolution
   // function.
   void Callback(bool can_handle) {
     gfx::Size target_size =
         can_handle ? landscape_.size() : gfx::Size(kNexus5Width, kNexus5Height);
-    LaunchAppWithRect(context_, app_id_, GetTargetRect(target_size),
-                      event_flags_);
+    LaunchAppWithRect(context_, app_id_, GetTargetRect(target_size));
     // Now that we are done, we can delete ourselves.
     delete this;
   }
 
   DISALLOW_COPY_AND_ASSIGN(LaunchAppWithoutSize);
 };
 
 }  // namespace
 
 const char kPlayStoreAppId[] = "gpkmicpkkebkmabiaedjognfppcchdfa";
 const char kPlayStorePackage[] = "com.android.vending";
 const char kPlayStoreActivity[] = "com.android.vending.AssetBrowserActivity";
 const char kSettingsAppId[] = "mconboelelhjpkbdhhiijkgcimoangdj";
 
 bool ShouldShowInLauncher(const std::string& app_id) {
   return (app_id != kSettingsAppId);
 }
 
 bool LaunchAppWithRect(content::BrowserContext* context,
                        const std::string& app_id,
-                       const gfx::Rect& target_rect,
-                       int event_flags) {
+                       const gfx::Rect& target_rect) {
   ArcAppListPrefs* prefs = ArcAppListPrefs::Get(context);
   CHECK(prefs);
 
   std::unique_ptr<ArcAppListPrefs::AppInfo> app_info = prefs->GetApp(app_id);
   if (!app_info) {
     VLOG(2) << "Cannot launch unavailable app: " << app_id << ".";
     return false;
   }
 
   if (!app_info->ready) {
     VLOG(2) << "Cannot launch not-ready app: " << app_id << ".";
     return false;
   }
 
   if (!app_info->launchable) {
     VLOG(2) << "Cannot launch non-launchable app: " << app_id << ".";
     return false;
   }
 
   arc::mojom::AppInstance* app_instance =
       GetAppInstance(kMinVersion, kLaunchAppStr);
   if (!app_instance)
     return false;
 
-  arc::mojom::IntentHelperInstance* intent_helper_instance =
-      GetIntentHelperInstance(kSendBroadcastMinVersion, kSendBroadcastStr);
-  if (intent_helper_instance) {
-    base::DictionaryValue extras;
-    extras.SetBoolean("inTouchMode", IsMouseOrTouchEventFromFlags(event_flags));
-    std::string extras_string;
-    base::JSONWriter::Write(extras, &extras_string);
-    intent_helper_instance->SendBroadcast(
-        kSetInTouchModeIntent, kIntentHelperPackageName, kIntentHelperClassName,
-        extras_string);
-  }
-
   if (app_info->shortcut) {
     app_instance->LaunchIntent(app_info->intent_uri, target_rect);
   } else {
     app_instance->LaunchApp(app_info->package_name, app_info->activity,
                             target_rect);
   }
   prefs->SetLastLaunchTime(app_id, base::Time::Now());
 
   return true;
 }
 
-bool LaunchAndroidSettingsApp(content::BrowserContext* context,
-                              int event_flags) {
+bool LaunchAndroidSettingsApp(content::BrowserContext* context) {
   constexpr bool kUseLandscapeLayout = true;
-  return arc::LaunchApp(context, kSettingsAppId, kUseLandscapeLayout,
-                        event_flags);
+  return arc::LaunchApp(context, kSettingsAppId, kUseLandscapeLayout);
+}
+
+bool LaunchApp(content::BrowserContext* context, const std::string& app_id) {
+  return LaunchApp(context, app_id, true);
 }
 
 bool LaunchApp(content::BrowserContext* context,
                const std::string& app_id,
-               int event_flags) {
-  constexpr bool kUseLandscapeLayout = true;
-  return LaunchApp(context, app_id, kUseLandscapeLayout, event_flags);
-}
-
-bool LaunchApp(content::BrowserContext* context,
-               const std::string& app_id,
-               bool landscape_layout,
-               int event_flags) {
+               bool landscape_layout) {
   ArcAppListPrefs* prefs = ArcAppListPrefs::Get(context);
   std::unique_ptr<ArcAppListPrefs::AppInfo> app_info = prefs->GetApp(app_id);
   if (app_info && !app_info->ready) {
     ArcSessionManager* arc_session_manager = ArcSessionManager::Get();
     DCHECK(arc_session_manager);
 
     bool arc_activated = false;
     if (!arc_session_manager->IsArcEnabled()) {
       if (!prefs->IsDefault(app_id)) {
         NOTREACHED();
@@ skipping 10 matching lines @@
 
     // PlayStore item has special handling for shelf controllers. In order to
     // avoid unwanted initial animation for PlayStore item do not create
     // deferred launch request when PlayStore item enables Arc.
     if (!arc_activated || app_id != kPlayStoreAppId) {
       ChromeLauncherController* chrome_controller =
           ChromeLauncherController::instance();
       DCHECK(chrome_controller || !ash::Shell::HasInstance());
       if (chrome_controller) {
         chrome_controller->GetArcDeferredLauncher()->RegisterDeferredLaunch(
-            app_id, event_flags);
+            app_id);
 
         // On some boards, ARC is booted with a restricted set of resources by
         // default to avoid slowing down Chrome's user session restoration.
         // However, the restriction should be lifted once the user explicitly
         // tries to launch an ARC app.
         VLOG(2) << "Prioritizing the instance";
         chromeos::SessionManagerClient* session_manager_client =
             chromeos::DBusThreadManager::Get()->GetSessionManagerClient();
         session_manager_client->PrioritizeArcInstance(
             base::Bind(PrioritizeArcInstanceCallback));
       }
     }
     prefs->SetLastLaunchTime(app_id, base::Time::Now());
     return true;
   }
 
-  return (new LaunchAppWithoutSize(context, app_id, landscape_layout,
-                                   event_flags))
+  return (new LaunchAppWithoutSize(context, app_id, landscape_layout))
       ->LaunchAndRelease();
 }
 
 void SetTaskActive(int task_id) {
   arc::mojom::AppInstance* app_instance =
       GetAppInstance(kTaskSupportMinVersion, kSetActiveTaskStr);
   if (!app_instance)
     return;
   app_instance->SetTaskActive(task_id);
 }
 
 void CloseTask(int task_id) {
   arc::mojom::AppInstance* app_instance =
       GetAppInstance(kTaskSupportMinVersion, kCloseTaskStr);
   if (!app_instance)
     return;
   app_instance->CloseTask(task_id);
 }
 
 void ShowTalkBackSettings() {
-  arc::mojom::IntentHelperInstance* intent_helper_instance =
-      GetIntentHelperInstance(kSendBroadcastMinVersion, kSendBroadcastStr);
+  arc::ArcBridgeService* bridge_service = arc::ArcBridgeService::Get();
+  if (!bridge_service) {
+    VLOG(2) << "ARC bridge is not ready";
+    return;
+  }
+
+  auto* intent_helper_instance =
+      bridge_service->intent_helper()->GetInstanceForMethod(
+          "SendBroadcast", kSendBroadcastMinVersion);
   if (!intent_helper_instance)
     return;
 
-  intent_helper_instance->SendBroadcast(kShowTalkbackSettingsIntent,
-                                        kIntentHelperPackageName,
-                                        kIntentHelperClassName, "{}");
+  intent_helper_instance->SendBroadcast(
+          "org.chromium.arc.intent_helper.SHOW_TALKBACK_SETTINGS",
+          "org.chromium.arc.intent_helper",
+          "org.chromium.arc.intent_helper.SettingsReceiver",
+          "{}");
 }
 
 bool CanHandleResolution(content::BrowserContext* context,
                          const std::string& app_id,
                          const gfx::Rect& rect,
                          const CanHandleResolutionCallback& callback) {
   const ArcAppListPrefs* prefs = ArcAppListPrefs::Get(context);
   DCHECK(prefs);
   std::unique_ptr<ArcAppListPrefs::AppInfo> app_info = prefs->GetApp(app_id);
   if (!app_info) {
@@ skipping 57 matching lines @@
   if (!app_instance)
     return false;
 
   app_instance->ShowPackageInfoOnPage(
       package_name, page,
       GetTargetRect(gfx::Size(kNexus7Width, kNexus7Height)));
   return true;
 }
 
 }  // namespace arc