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

Unified Diff: chrome/browser/task_manager/sampling/task_manager_impl.cc

Issue 2648213004: Migrate --enable-arc and --arc-available part 1. (Closed)
Patch Set: address comments. 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
« no previous file with comments | « chrome/browser/sync/test/integration/sync_test.cc ('k') | chrome/browser/ui/app_list/arc/arc_app_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/task_manager/sampling/task_manager_impl.cc
diff --git a/chrome/browser/task_manager/sampling/task_manager_impl.cc b/chrome/browser/task_manager/sampling/task_manager_impl.cc
index dfed65a971cf3fa535f373a53e1eb853cbfe5444..b86748f7e88aeea245d5717f8ec0864f4e44f49e 100644
--- a/chrome/browser/task_manager/sampling/task_manager_impl.cc
+++ b/chrome/browser/task_manager/sampling/task_manager_impl.cc
@@ -10,7 +10,6 @@
#include <unordered_set>
#include <vector>
-#include "base/command_line.h"
#include "base/containers/adapters.h"
#include "build/build_config.h"
#include "chrome/browser/task_manager/providers/browser_process_task_provider.h"
@@ -25,7 +24,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/task_manager/providers/arc/arc_process_task_provider.h"
-#include "components/arc/arc_bridge_service.h"
+#include "components/arc/arc_util.h"
#endif // defined(OS_CHROMEOS)
namespace task_manager {
@@ -57,10 +56,8 @@ TaskManagerImpl::TaskManagerImpl()
task_providers_.emplace_back(new ChildProcessTaskProvider());
task_providers_.emplace_back(new WebContentsTaskProvider());
#if defined(OS_CHROMEOS)
- if (arc::ArcBridgeService::GetEnabled(
- base::CommandLine::ForCurrentProcess())) {
+ if (arc::IsArcAvailable())
task_providers_.emplace_back(new ArcProcessTaskProvider());
- }
#endif // defined(OS_CHROMEOS)
content::GpuDataManager::GetInstance()->AddObserver(this);
« no previous file with comments | « chrome/browser/sync/test/integration/sync_test.cc ('k') | chrome/browser/ui/app_list/arc/arc_app_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698