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

Side by Side Diff: chrome/browser/task_manager_resource_providers.cc

Issue 42366: Fix single-process ui test failures from my previous change. The problem was... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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_resource_providers.h" 5 #include "chrome/browser/task_manager_resource_providers.h"
6 6
7 #include "base/file_version_info.h" 7 #include "base/file_version_info.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/process_util.h" 9 #include "base/process_util.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 //////////////////////////////////////////////////////////////////////////////// 257 ////////////////////////////////////////////////////////////////////////////////
258 SkBitmap* TaskManagerChildProcessResource::default_icon_ = NULL; 258 SkBitmap* TaskManagerChildProcessResource::default_icon_ = NULL;
259 259
260 TaskManagerChildProcessResource::TaskManagerChildProcessResource( 260 TaskManagerChildProcessResource::TaskManagerChildProcessResource(
261 ChildProcessInfo child_proc) 261 ChildProcessInfo child_proc)
262 : child_process_(child_proc), 262 : child_process_(child_proc),
263 title_(), 263 title_(),
264 network_usage_support_(false) { 264 network_usage_support_(false) {
265 // We cache the process id because it's not cheap to calculate, and it won't 265 // We cache the process id because it's not cheap to calculate, and it won't
266 // be available when we get the plugin disconnected notification. 266 // be available when we get the plugin disconnected notification.
267 pid_ = child_proc.pid(); 267 pid_ = child_proc.GetProcessId();
268 if (!default_icon_) { 268 if (!default_icon_) {
269 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 269 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
270 default_icon_ = rb.GetBitmapNamed(IDR_PLUGIN); 270 default_icon_ = rb.GetBitmapNamed(IDR_PLUGIN);
271 // TODO(jabdelmalek): use different icon for web workers. 271 // TODO(jabdelmalek): use different icon for web workers.
272 } 272 }
273 } 273 }
274 274
275 TaskManagerChildProcessResource::~TaskManagerChildProcessResource() { 275 TaskManagerChildProcessResource::~TaskManagerChildProcessResource() {
276 } 276 }
277 277
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 519
520 return &resource_; 520 return &resource_;
521 } 521 }
522 522
523 void TaskManagerBrowserProcessResourceProvider::StartUpdating() { 523 void TaskManagerBrowserProcessResourceProvider::StartUpdating() {
524 task_manager_->AddResource(&resource_); 524 task_manager_->AddResource(&resource_);
525 } 525 }
526 526
527 void TaskManagerBrowserProcessResourceProvider::StopUpdating() { 527 void TaskManagerBrowserProcessResourceProvider::StopUpdating() {
528 } 528 }
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/resource_message_filter.h ('k') | chrome/common/child_process_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698