| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/task_manager.h" | 5 #include "chrome/browser/task_manager/task_manager.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/i18n/number_formatting.h" | 8 #include "base/i18n/number_formatting.h" |
| 9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
| 10 #include "base/prefs/pref_registry_simple.h" | 10 #include "base/prefs/pref_registry_simple.h" |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 #include "content/public/common/result_codes.h" | 40 #include "content/public/common/result_codes.h" |
| 41 #include "extensions/browser/extension_system.h" | 41 #include "extensions/browser/extension_system.h" |
| 42 #include "grit/generated_resources.h" | 42 #include "grit/generated_resources.h" |
| 43 #include "grit/ui_resources.h" | 43 #include "grit/ui_resources.h" |
| 44 #include "third_party/icu/source/i18n/unicode/coll.h" | 44 #include "third_party/icu/source/i18n/unicode/coll.h" |
| 45 #include "ui/base/l10n/l10n_util.h" | 45 #include "ui/base/l10n/l10n_util.h" |
| 46 #include "ui/base/resource/resource_bundle.h" | 46 #include "ui/base/resource/resource_bundle.h" |
| 47 #include "ui/base/text/bytes_formatting.h" | 47 #include "ui/base/text/bytes_formatting.h" |
| 48 #include "ui/gfx/image/image_skia.h" | 48 #include "ui/gfx/image/image_skia.h" |
| 49 | 49 |
| 50 #if defined(TOOLKIT_GTK) | |
| 51 #include "chrome/browser/task_manager/notification_resource_provider.h" | |
| 52 #endif | |
| 53 | |
| 54 #if defined(OS_MACOSX) | 50 #if defined(OS_MACOSX) |
| 55 #include "content/public/browser/browser_child_process_host.h" | 51 #include "content/public/browser/browser_child_process_host.h" |
| 56 #endif | 52 #endif |
| 57 | 53 |
| 58 using content::BrowserThread; | 54 using content::BrowserThread; |
| 59 using content::ResourceRequestInfo; | 55 using content::ResourceRequestInfo; |
| 60 using content::WebContents; | 56 using content::WebContents; |
| 61 using task_manager::Resource; | 57 using task_manager::Resource; |
| 62 using task_manager::ResourceProvider; | 58 using task_manager::ResourceProvider; |
| 63 using task_manager::WebContentsInformation; | 59 using task_manager::WebContentsInformation; |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 new task_manager::ChildProcessResourceProvider(task_manager)); | 265 new task_manager::ChildProcessResourceProvider(task_manager)); |
| 270 AddResourceProvider(new task_manager::WebContentsResourceProvider( | 266 AddResourceProvider(new task_manager::WebContentsResourceProvider( |
| 271 task_manager, | 267 task_manager, |
| 272 scoped_ptr<WebContentsInformation>( | 268 scoped_ptr<WebContentsInformation>( |
| 273 new task_manager::ExtensionInformation()))); | 269 new task_manager::ExtensionInformation()))); |
| 274 AddResourceProvider(new task_manager::WebContentsResourceProvider( | 270 AddResourceProvider(new task_manager::WebContentsResourceProvider( |
| 275 task_manager, | 271 task_manager, |
| 276 scoped_ptr<WebContentsInformation>( | 272 scoped_ptr<WebContentsInformation>( |
| 277 new task_manager::GuestInformation()))); | 273 new task_manager::GuestInformation()))); |
| 278 | 274 |
| 279 #if defined(TOOLKIT_GTK) && defined(ENABLE_NOTIFICATIONS) | |
| 280 ResourceProvider* provider = | |
| 281 task_manager::NotificationResourceProvider::Create(task_manager); | |
| 282 if (provider) | |
| 283 AddResourceProvider(provider); | |
| 284 #endif | |
| 285 | |
| 286 AddResourceProvider(new task_manager::WorkerResourceProvider(task_manager)); | 275 AddResourceProvider(new task_manager::WorkerResourceProvider(task_manager)); |
| 287 } | 276 } |
| 288 | 277 |
| 289 void TaskManagerModel::AddObserver(TaskManagerModelObserver* observer) { | 278 void TaskManagerModel::AddObserver(TaskManagerModelObserver* observer) { |
| 290 observer_list_.AddObserver(observer); | 279 observer_list_.AddObserver(observer); |
| 291 } | 280 } |
| 292 | 281 |
| 293 void TaskManagerModel::RemoveObserver(TaskManagerModelObserver* observer) { | 282 void TaskManagerModel::RemoveObserver(TaskManagerModelObserver* observer) { |
| 294 observer_list_.RemoveObserver(observer); | 283 observer_list_.RemoveObserver(observer); |
| 295 } | 284 } |
| (...skipping 1296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1592 params.host_desktop_type = desktop_type; | 1581 params.host_desktop_type = desktop_type; |
| 1593 chrome::Navigate(¶ms); | 1582 chrome::Navigate(¶ms); |
| 1594 } | 1583 } |
| 1595 | 1584 |
| 1596 TaskManager::TaskManager() | 1585 TaskManager::TaskManager() |
| 1597 : model_(new TaskManagerModel(this)) { | 1586 : model_(new TaskManagerModel(this)) { |
| 1598 } | 1587 } |
| 1599 | 1588 |
| 1600 TaskManager::~TaskManager() { | 1589 TaskManager::~TaskManager() { |
| 1601 } | 1590 } |
| OLD | NEW |