Chromium Code Reviews| OLD | NEW |
|---|---|
| 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_management/task_manager_interface.h" | 5 #include "chrome/browser/task_management/task_manager_interface.h" |
| 6 | 6 |
| 7 #include "chrome/browser/browser_process.h" | |
| 7 #include "chrome/browser/task_management/sampling/task_manager_impl.h" | 8 #include "chrome/browser/task_management/sampling/task_manager_impl.h" |
| 8 #include "chrome/browser/task_management/sampling/task_manager_io_thread_helper. h" | 9 #include "chrome/browser/task_management/sampling/task_manager_io_thread_helper. h" |
| 9 #include "chrome/browser/task_manager/task_manager.h" | |
| 10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
| 11 #include "chrome/common/pref_names.h" | |
| 12 #include "components/prefs/pref_registry_simple.h" | |
| 13 #include "components/prefs/pref_service.h" | |
| 11 #include "content/public/browser/browser_thread.h" | 14 #include "content/public/browser/browser_thread.h" |
| 12 | 15 |
| 16 #if defined(OS_MACOSX) | |
| 17 #include "chrome/browser/task_manager/task_manager.h" | |
| 18 #endif // defined(OS_MACOSX) | |
| 19 | |
| 13 namespace task_management { | 20 namespace task_management { |
| 14 | 21 |
| 15 // static | 22 // static |
| 23 void TaskManagerInterface::RegisterPrefs(PrefRegistrySimple* registry) { | |
| 24 registry->RegisterDictionaryPref(prefs::kTaskManagerWindowPlacement); | |
| 25 registry->RegisterDictionaryPref(prefs::kTaskManagerColumnVisibility); | |
| 26 registry->RegisterBooleanPref(prefs::kTaskManagerEndProcessEnabled, true); | |
| 27 } | |
| 28 | |
| 29 // static | |
| 30 bool TaskManagerInterface::IsEndProcessEnabled() { | |
| 31 auto* state = g_browser_process->local_state(); | |
|
tapted
2016/04/26 01:54:03
nit: auto* -> PrefService* (I don't think this me
afakhry
2016/04/26 22:22:43
Done.
| |
| 32 return state ? state->GetBoolean(prefs::kTaskManagerEndProcessEnabled) : true; | |
|
tapted
2016/04/26 01:54:03
optional-nit: I'd write this `return !state || sta
afakhry
2016/04/26 22:22:43
I like it. Done!
| |
| 33 } | |
| 34 | |
| 35 // static | |
| 16 TaskManagerInterface* TaskManagerInterface::GetTaskManager() { | 36 TaskManagerInterface* TaskManagerInterface::GetTaskManager() { |
| 17 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 37 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
| 18 | 38 |
| 19 return TaskManagerImpl::GetInstance(); | 39 return TaskManagerImpl::GetInstance(); |
| 20 } | 40 } |
| 21 | 41 |
| 22 // static | 42 // static |
| 23 void TaskManagerInterface::OnRawBytesRead(const net::URLRequest& request, | 43 void TaskManagerInterface::OnRawBytesRead(const net::URLRequest& request, |
| 24 int64_t bytes_read) { | 44 int64_t bytes_read) { |
| 25 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); | 45 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
| 26 | 46 |
| 27 if (switches::NewTaskManagerEnabled()) | 47 #if defined(OS_MACOSX) |
| 28 TaskManagerIoThreadHelper::OnRawBytesRead(request, bytes_read); | 48 TaskManager::GetInstance()->model()->NotifyBytesRead(request, bytes_read); |
|
tapted
2016/04/26 01:54:03
You can already show the new task manager on Mac -
afakhry
2016/04/26 22:22:43
Thanks! Done.
| |
| 29 else | 49 #else |
| 30 TaskManager::GetInstance()->model()->NotifyBytesRead(request, bytes_read); | 50 TaskManagerIoThreadHelper::OnRawBytesRead(request, bytes_read); |
| 51 #endif // defined(OS_MACOSX) | |
| 31 } | 52 } |
| 32 | 53 |
| 33 void TaskManagerInterface::AddObserver(TaskManagerObserver* observer) { | 54 void TaskManagerInterface::AddObserver(TaskManagerObserver* observer) { |
| 34 observers_.AddObserver(observer); | 55 observers_.AddObserver(observer); |
| 35 observer->observed_task_manager_ = this; | 56 observer->observed_task_manager_ = this; |
| 36 | 57 |
| 37 ResourceFlagsAdded(observer->desired_resources_flags()); | 58 ResourceFlagsAdded(observer->desired_resources_flags()); |
| 38 | 59 |
| 39 base::TimeDelta current_refresh_time = GetCurrentRefreshTime(); | 60 base::TimeDelta current_refresh_time = GetCurrentRefreshTime(); |
| 40 if (current_refresh_time == base::TimeDelta::Max()) { | 61 if (current_refresh_time == base::TimeDelta::Max()) { |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 139 } | 160 } |
| 140 | 161 |
| 141 void TaskManagerInterface::ScheduleRefresh(base::TimeDelta refresh_time) { | 162 void TaskManagerInterface::ScheduleRefresh(base::TimeDelta refresh_time) { |
| 142 refresh_timer_->Start(FROM_HERE, | 163 refresh_timer_->Start(FROM_HERE, |
| 143 refresh_time, | 164 refresh_time, |
| 144 base::Bind(&TaskManagerInterface::Refresh, | 165 base::Bind(&TaskManagerInterface::Refresh, |
| 145 base::Unretained(this))); | 166 base::Unretained(this))); |
| 146 } | 167 } |
| 147 | 168 |
| 148 } // namespace task_management | 169 } // namespace task_management |
| OLD | NEW |