| Index: chrome/browser/chromeos/file_manager/arc_file_tasks.cc
|
| diff --git a/chrome/browser/chromeos/file_manager/arc_file_tasks.cc b/chrome/browser/chromeos/file_manager/arc_file_tasks.cc
|
| index 215ce34759fc5e008360ac1a91d976c720431a76..bb9e2d16e2066b9c14403884eb2ae534dd6910bc 100644
|
| --- a/chrome/browser/chromeos/file_manager/arc_file_tasks.cc
|
| +++ b/chrome/browser/chromeos/file_manager/arc_file_tasks.cc
|
| @@ -7,6 +7,7 @@
|
| #include <map>
|
| #include <memory>
|
| #include <string>
|
| +#include <utility>
|
| #include <vector>
|
|
|
| #include "base/base64.h"
|
| @@ -51,14 +52,17 @@ constexpr char kPngDataUrlPrefix[] = "data:image/png;base64,";
|
|
|
| // Returns the Mojo interface for ARC Intent Helper, with version |minVersion|
|
| // or above. If the ARC bridge is not established, returns null.
|
| -arc::mojom::IntentHelperInstance* GetArcIntentHelper(Profile* profile,
|
| - uint32_t min_version) {
|
| +arc::mojom::IntentHelperInstance* GetArcIntentHelper(
|
| + Profile* profile,
|
| + const std::string& method_name_for_logging,
|
| + uint32_t min_version) {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
| // File manager in secondary profile cannot access ARC.
|
| if (!chromeos::ProfileHelper::IsPrimaryProfile(profile))
|
| return nullptr;
|
| - return arc::ArcIntentHelperBridge::GetIntentHelperInstance(min_version);
|
| + return arc::ArcIntentHelperBridge::GetIntentHelperInstance(
|
| + method_name_for_logging, min_version);
|
| }
|
|
|
| // Returns the icon loader that wraps the Mojo interface for ARC Intent Helper.
|
| @@ -274,7 +278,8 @@ void FindArcTasks(Profile* profile,
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
| arc::mojom::IntentHelperInstance* arc_intent_helper =
|
| - GetArcIntentHelper(profile, kArcIntentHelperVersionWithUrlListSupport);
|
| + GetArcIntentHelper(profile, "RequestUrlListHandlerList",
|
| + kArcIntentHelperVersionWithUrlListSupport);
|
| if (!arc_intent_helper) {
|
| callback.Run(std::move(result_list));
|
| return;
|
| @@ -312,7 +317,8 @@ bool ExecuteArcTask(Profile* profile,
|
| DCHECK_EQ(file_urls.size(), mime_types.size());
|
|
|
| arc::mojom::IntentHelperInstance* const arc_intent_helper =
|
| - GetArcIntentHelper(profile, kArcIntentHelperVersionWithUrlListSupport);
|
| + GetArcIntentHelper(profile, "HandleUrlListDeprecated",
|
| + kArcIntentHelperVersionWithUrlListSupport);
|
| if (!arc_intent_helper)
|
| return false;
|
|
|
| @@ -331,7 +337,7 @@ bool ExecuteArcTask(Profile* profile,
|
| urls.push_back(std::move(url_with_type));
|
| }
|
|
|
| - if (GetArcIntentHelper(profile,
|
| + if (GetArcIntentHelper(profile, "HandleUrlList",
|
| kArcIntentHelperVersionWithFullActivityName)) {
|
| arc_intent_helper->HandleUrlList(std::move(urls),
|
| AppIdToActivityName(task.app_id),
|
|
|