| 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/browser_process.h" |
| 8 #include "chrome/browser/task_management/sampling/task_manager_impl.h" | 8 #include "chrome/browser/task_management/sampling/task_manager_impl.h" |
| 9 #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" |
| 10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 registry->RegisterDictionaryPref(prefs::kTaskManagerColumnVisibility); | 25 registry->RegisterDictionaryPref(prefs::kTaskManagerColumnVisibility); |
| 26 registry->RegisterBooleanPref(prefs::kTaskManagerEndProcessEnabled, true); | 26 registry->RegisterBooleanPref(prefs::kTaskManagerEndProcessEnabled, true); |
| 27 } | 27 } |
| 28 | 28 |
| 29 // static | 29 // static |
| 30 bool TaskManagerInterface::IsEndProcessEnabled() { | 30 bool TaskManagerInterface::IsEndProcessEnabled() { |
| 31 PrefService* state = g_browser_process->local_state(); | 31 PrefService* state = g_browser_process->local_state(); |
| 32 return !state || state->GetBoolean(prefs::kTaskManagerEndProcessEnabled); | 32 return !state || state->GetBoolean(prefs::kTaskManagerEndProcessEnabled); |
| 33 } | 33 } |
| 34 | 34 |
| 35 #if defined(OS_MACOSX) | |
| 36 // static | |
| 37 bool TaskManagerInterface::IsNewTaskManagerEnabled() { | |
| 38 return chrome::ToolkitViewsDialogsEnabled(); | |
| 39 } | |
| 40 #endif // defined(OS_MACOSX) | |
| 41 | |
| 42 // static | 35 // static |
| 43 TaskManagerInterface* TaskManagerInterface::GetTaskManager() { | 36 TaskManagerInterface* TaskManagerInterface::GetTaskManager() { |
| 44 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 37 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
| 45 | 38 |
| 46 return TaskManagerImpl::GetInstance(); | 39 return TaskManagerImpl::GetInstance(); |
| 47 } | 40 } |
| 48 | 41 |
| 49 // static | 42 // static |
| 50 void TaskManagerInterface::OnRawBytesRead(const net::URLRequest& request, | 43 void TaskManagerInterface::OnRawBytesRead(const net::URLRequest& request, |
| 51 int64_t bytes_read) { | 44 int64_t bytes_read) { |
| 52 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); | 45 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
| 53 | 46 |
| 54 #if defined(OS_MACOSX) | |
| 55 if (chrome::NotifyOldTaskManagerBytesRead(request, bytes_read)) | |
| 56 return; | |
| 57 #endif // defined(OS_MACOSX) | |
| 58 | |
| 59 TaskManagerIoThreadHelper::OnRawBytesRead(request, bytes_read); | 47 TaskManagerIoThreadHelper::OnRawBytesRead(request, bytes_read); |
| 60 } | 48 } |
| 61 | 49 |
| 62 void TaskManagerInterface::AddObserver(TaskManagerObserver* observer) { | 50 void TaskManagerInterface::AddObserver(TaskManagerObserver* observer) { |
| 63 observers_.AddObserver(observer); | 51 observers_.AddObserver(observer); |
| 64 observer->observed_task_manager_ = this; | 52 observer->observed_task_manager_ = this; |
| 65 | 53 |
| 66 ResourceFlagsAdded(observer->desired_resources_flags()); | 54 ResourceFlagsAdded(observer->desired_resources_flags()); |
| 67 | 55 |
| 68 base::TimeDelta current_refresh_time = GetCurrentRefreshTime(); | 56 base::TimeDelta current_refresh_time = GetCurrentRefreshTime(); |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 } | 156 } |
| 169 | 157 |
| 170 void TaskManagerInterface::ScheduleRefresh(base::TimeDelta refresh_time) { | 158 void TaskManagerInterface::ScheduleRefresh(base::TimeDelta refresh_time) { |
| 171 refresh_timer_->Start(FROM_HERE, | 159 refresh_timer_->Start(FROM_HERE, |
| 172 refresh_time, | 160 refresh_time, |
| 173 base::Bind(&TaskManagerInterface::Refresh, | 161 base::Bind(&TaskManagerInterface::Refresh, |
| 174 base::Unretained(this))); | 162 base::Unretained(this))); |
| 175 } | 163 } |
| 176 | 164 |
| 177 } // namespace task_management | 165 } // namespace task_management |
| OLD | NEW |