arc: Revamp the ArcBridgeService interface

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 <string>
 
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/synchronization/waitable_event.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 "components/arc/arc_bridge_service.h"
 #include "ui/aura/window.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 
 namespace arc {
 
 namespace {
 
+constexpr bool kUseLandscapeLayout = true;

[hidehiko, 2016/07/12 16:25:14]

optional: as this is constexpr, and used only in LaunchAndroidSettingsApp, you
can safely move this to the function, like:

LaunchAndroidSettingsApp(...) {
  constexpr bool kUseLnadscapeLayout = true;
  return arc::LaunchApp(..., kUseLandscapeLayout);
}

Up to you.

[Luis Héctor Chávez, 2016/07/12 18:00:24]

Looks cleaner, so done.

+
 // Default sizes to use.
 constexpr int kNexus7Width = 960;
 constexpr int kNexus7Height = 600;
 constexpr int kNexus5Width = 410;
 constexpr int kNexus5Height = 690;
 
 // Minimum required versions.
 constexpr int kMinVersion = 0;
 constexpr int kCanHandleResolutionMinVersion = 1;
 constexpr int kUninstallPackageMinVersion = 2;
@@ skipping 12 matching lines @@
 // happens.
 arc::mojom::AppInstance* GetAppInstance(int 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;
   }
 
-  arc::mojom::AppInstance* app_instance = bridge_service->app_instance();
+  arc::mojom::AppInstance* app_instance = bridge_service->app()->instance();
   if (!app_instance) {
     VLOG(2) << "Request to " << service_name
             << " when mojom::app_instance is not ready.";
     return nullptr;
   }
 
-  int bridge_version = bridge_service->app_version();
+  int bridge_version = bridge_service->app()->version();
   if (bridge_version < required_version) {
     VLOG(2) << "Request to " << service_name << " when Arc version "
             << bridge_version << " does not support it.";
     return nullptr;
   }
 
   return app_instance;
 }
 
 // Find a proper size and position for a given rectangle on the screen.
@@ skipping 28 matching lines @@
 }
 
 // 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) :
-      context_(context),
-      app_id_(app_id),
-      landscape_mode_(landscape_mode) {}
+                       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_);
       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_,
+    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_;
@@ skipping 49 matching lines @@
   } 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) {
-  return arc::LaunchApp(context,
-                        kSettingsAppId,
-                        true);  // landscape_layout
+  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,
                bool landscape_layout) {
   const ArcAppListPrefs* prefs = ArcAppListPrefs::Get(context);
   std::unique_ptr<ArcAppListPrefs::AppInfo> app_info = prefs->GetApp(app_id);
   if (app_info && !app_info->ready) {
     if (!ash::Shell::HasInstance())
       return false;
 
     ChromeLauncherController* chrome_controller =
         ChromeLauncherController::instance();
     DCHECK(chrome_controller);
     chrome_controller->GetArcDeferredLauncher()->RegisterDeferredLaunch(app_id);
     return true;
   }
 
-  return (new LaunchAppWithoutSize(context,
-                                   app_id,
-                                   landscape_layout))->LaunchAndRelease();
+  return (new LaunchAppWithoutSize(context, app_id, landscape_layout))
+      ->LaunchAndRelease();
 }
 
 bool CanHandleResolution(content::BrowserContext* context,
-    const std::string& app_id,
-    const gfx::Rect& rect,
-    const CanHandleResolutionCallback& callback) {
+                         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) {
     VLOG(2) << "Cannot test resolution capability of unavailable app:" << app_id
             << ".";
     return false;
   }
 
   arc::mojom::AppInstance* app_instance =
@@ skipping 51 matching lines @@
   if (!app_instance)
     return false;
 
   app_instance->ShowPackageInfoOnPage(
       package_name, page,
       GetTargetRect(gfx::Size(kNexus7Width, kNexus7Height)));
   return true;
 }
 
 }  // namespace arc