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

Side by Side 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, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/task_manager/sampling/task_manager_impl.h" 5 #include "chrome/browser/task_manager/sampling/task_manager_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <unordered_map> 9 #include <unordered_map>
10 #include <unordered_set> 10 #include <unordered_set>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/command_line.h"
14 #include "base/containers/adapters.h" 13 #include "base/containers/adapters.h"
15 #include "build/build_config.h" 14 #include "build/build_config.h"
16 #include "chrome/browser/task_manager/providers/browser_process_task_provider.h" 15 #include "chrome/browser/task_manager/providers/browser_process_task_provider.h"
17 #include "chrome/browser/task_manager/providers/child_process_task_provider.h" 16 #include "chrome/browser/task_manager/providers/child_process_task_provider.h"
18 #include "chrome/browser/task_manager/providers/web_contents/web_contents_task_p rovider.h" 17 #include "chrome/browser/task_manager/providers/web_contents/web_contents_task_p rovider.h"
19 #include "chrome/browser/task_manager/sampling/shared_sampler.h" 18 #include "chrome/browser/task_manager/sampling/shared_sampler.h"
20 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
21 #include "content/public/browser/gpu_data_manager.h" 20 #include "content/public/browser/gpu_data_manager.h"
22 #include "content/public/browser/render_frame_host.h" 21 #include "content/public/browser/render_frame_host.h"
23 #include "content/public/browser/render_process_host.h" 22 #include "content/public/browser/render_process_host.h"
24 #include "content/public/browser/web_contents.h" 23 #include "content/public/browser/web_contents.h"
25 24
26 #if defined(OS_CHROMEOS) 25 #if defined(OS_CHROMEOS)
27 #include "chrome/browser/task_manager/providers/arc/arc_process_task_provider.h" 26 #include "chrome/browser/task_manager/providers/arc/arc_process_task_provider.h"
28 #include "components/arc/arc_bridge_service.h" 27 #include "components/arc/arc_util.h"
29 #endif // defined(OS_CHROMEOS) 28 #endif // defined(OS_CHROMEOS)
30 29
31 namespace task_manager { 30 namespace task_manager {
32 31
33 namespace { 32 namespace {
34 33
35 scoped_refptr<base::SequencedTaskRunner> GetBlockingPoolRunner() { 34 scoped_refptr<base::SequencedTaskRunner> GetBlockingPoolRunner() {
36 base::SequencedWorkerPool* blocking_pool = 35 base::SequencedWorkerPool* blocking_pool =
37 content::BrowserThread::GetBlockingPool(); 36 content::BrowserThread::GetBlockingPool();
38 return blocking_pool->GetSequencedTaskRunner( 37 return blocking_pool->GetSequencedTaskRunner(
(...skipping 11 matching lines...) Expand all
50 base::Unretained(this))), 49 base::Unretained(this))),
51 blocking_pool_runner_(GetBlockingPoolRunner()), 50 blocking_pool_runner_(GetBlockingPoolRunner()),
52 shared_sampler_(new SharedSampler(blocking_pool_runner_)), 51 shared_sampler_(new SharedSampler(blocking_pool_runner_)),
53 is_running_(false) { 52 is_running_(false) {
54 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 53 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
55 54
56 task_providers_.emplace_back(new BrowserProcessTaskProvider()); 55 task_providers_.emplace_back(new BrowserProcessTaskProvider());
57 task_providers_.emplace_back(new ChildProcessTaskProvider()); 56 task_providers_.emplace_back(new ChildProcessTaskProvider());
58 task_providers_.emplace_back(new WebContentsTaskProvider()); 57 task_providers_.emplace_back(new WebContentsTaskProvider());
59 #if defined(OS_CHROMEOS) 58 #if defined(OS_CHROMEOS)
60 if (arc::ArcBridgeService::GetEnabled( 59 if (arc::IsArcAvailable())
61 base::CommandLine::ForCurrentProcess())) {
62 task_providers_.emplace_back(new ArcProcessTaskProvider()); 60 task_providers_.emplace_back(new ArcProcessTaskProvider());
63 }
64 #endif // defined(OS_CHROMEOS) 61 #endif // defined(OS_CHROMEOS)
65 62
66 content::GpuDataManager::GetInstance()->AddObserver(this); 63 content::GpuDataManager::GetInstance()->AddObserver(this);
67 } 64 }
68 65
69 TaskManagerImpl::~TaskManagerImpl() { 66 TaskManagerImpl::~TaskManagerImpl() {
70 content::GpuDataManager::GetInstance()->RemoveObserver(this); 67 content::GpuDataManager::GetInstance()->RemoveObserver(this);
71 } 68 }
72 69
73 // static 70 // static
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 groups_itr.second->AreBackgroundCalculationsDone(); 559 groups_itr.second->AreBackgroundCalculationsDone();
563 } 560 }
564 if (are_all_processes_data_ready) { 561 if (are_all_processes_data_ready) {
565 NotifyObserversOnRefreshWithBackgroundCalculations(GetTaskIdsList()); 562 NotifyObserversOnRefreshWithBackgroundCalculations(GetTaskIdsList());
566 for (const auto& groups_itr : task_groups_by_proc_id_) 563 for (const auto& groups_itr : task_groups_by_proc_id_)
567 groups_itr.second->ClearCurrentBackgroundCalculationsFlags(); 564 groups_itr.second->ClearCurrentBackgroundCalculationsFlags();
568 } 565 }
569 } 566 }
570 567
571 } // namespace task_manager 568 } // namespace task_manager
OLDNEW
« 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