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

Side by Side Diff: chrome/browser/task_manager/providers/child_process_task.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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/providers/child_process_task.h" 5 #include "chrome/browser/task_manager/providers/child_process_task.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/numerics/safe_conversions.h" 10 #include "base/numerics/safe_conversions.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/process_resource_usage.h" 13 #include "chrome/browser/process_resource_usage.h"
14 #include "chrome/browser/profiles/profile_manager.h" 14 #include "chrome/browser/profiles/profile_manager.h"
15 #include "chrome/browser/task_manager/task_manager_observer.h" 15 #include "chrome/browser/task_manager/task_manager_observer.h"
16 #include "chrome/grit/generated_resources.h" 16 #include "chrome/grit/generated_resources.h"
17 #include "chrome/grit/theme_resources.h" 17 #include "chrome/grit/theme_resources.h"
18 #include "components/nacl/common/nacl_process_type.h" 18 #include "components/nacl/common/nacl_process_type.h"
19 #include "content/public/browser/browser_child_process_host.h" 19 #include "content/public/browser/browser_child_process_host.h"
20 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
21 #include "content/public/browser/child_process_data.h" 21 #include "content/public/browser/child_process_data.h"
22 #include "content/public/common/child_process_host.h" 22 #include "content/public/common/child_process_host.h"
23 #include "content/public/common/process_type.h" 23 #include "content/public/common/process_type.h"
24 #include "extensions/browser/extension_registry.h" 24 #include "extensions/browser/extension_registry.h"
25 #include "extensions/common/extension_set.h" 25 #include "extensions/common/extension_set.h"
26 #include "services/shell/public/cpp/interface_provider.h" 26 #include "services/service_manager/public/cpp/interface_provider.h"
27 #include "ui/base/l10n/l10n_util.h" 27 #include "ui/base/l10n/l10n_util.h"
28 #include "ui/base/resource/resource_bundle.h" 28 #include "ui/base/resource/resource_bundle.h"
29 29
30 namespace task_manager { 30 namespace task_manager {
31 31
32 namespace { 32 namespace {
33 33
34 gfx::ImageSkia* g_default_icon = nullptr; 34 gfx::ImageSkia* g_default_icon = nullptr;
35 35
36 gfx::ImageSkia* GetDefaultIcon() { 36 gfx::ImageSkia* GetDefaultIcon() {
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 229
230 int64_t ChildProcessTask::GetV8MemoryAllocated() const { 230 int64_t ChildProcessTask::GetV8MemoryAllocated() const {
231 return v8_memory_allocated_; 231 return v8_memory_allocated_;
232 } 232 }
233 233
234 int64_t ChildProcessTask::GetV8MemoryUsed() const { 234 int64_t ChildProcessTask::GetV8MemoryUsed() const {
235 return v8_memory_used_; 235 return v8_memory_used_;
236 } 236 }
237 237
238 } // namespace task_manager 238 } // namespace task_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698