Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Unified Diff: components/arc/intent_helper/arc_intent_helper_bridge.cc

Issue 2642783003: Move more utility functions to arc_util. (Closed)
Patch Set: Revert IsIntentHelperAvailable fix. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« components/arc/arc_util.cc ('K') | « components/arc/arc_util_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/arc/intent_helper/arc_intent_helper_bridge.cc
diff --git a/components/arc/intent_helper/arc_intent_helper_bridge.cc b/components/arc/intent_helper/arc_intent_helper_bridge.cc
index eae327e796ebed0849ee3b2c21ac07b65a1e27af..268f4956b33c01235331f6229e49d84631279538 100644
--- a/components/arc/intent_helper/arc_intent_helper_bridge.cc
+++ b/components/arc/intent_helper/arc_intent_helper_bridge.cc
@@ -11,10 +11,10 @@
#include "ash/common/wallpaper/wallpaper_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
-#include "base/command_line.h"
#include "base/memory/weak_ptr.h"
#include "components/arc/arc_bridge_service.h"
#include "components/arc/arc_service_manager.h"
+#include "components/arc/arc_util.h"
#include "components/arc/intent_helper/activity_icon_loader.h"
#include "components/arc/intent_helper/link_handler_model_impl.h"
#include "components/arc/intent_helper/local_activity_resolver.h"
@@ -133,12 +133,12 @@ ArcIntentHelperBridge::FilterOutIntentHelper(
bool ArcIntentHelperBridge::IsIntentHelperAvailable(GetResult* out_error_code) {
auto* arc_service_manager = ArcServiceManager::Get();
if (!arc_service_manager) {
- if (!ArcBridgeService::GetEnabled(base::CommandLine::ForCurrentProcess())) {
- VLOG(2) << "ARC bridge is not supported.";
+ if (!arc::util::IsArcEnabled()) {
hidehiko 2017/01/19 06:57:26 FYI to yusukes@. IIUC, this check is not up-to-da
Yusuke Sato 2017/01/19 22:39:31 That's fine but I also think we can remove the fun
+ VLOG(2) << "ARC service is not supported.";
if (out_error_code)
*out_error_code = GetResult::FAILED_ARC_NOT_SUPPORTED;
} else {
- VLOG(2) << "ARC bridge is not ready.";
+ VLOG(2) << "ARC service is not ready.";
if (out_error_code)
*out_error_code = GetResult::FAILED_ARC_NOT_READY;
}
« components/arc/arc_util.cc ('K') | « components/arc/arc_util_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698