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

Side by Side Diff: chrome/browser/task_manager/task_manager_worker_resource_provider.cc

Issue 10909187: Use the new favicon resources below common/, delete the old assets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 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) 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_worker_resource_provider.h" 5 #include "chrome/browser/task_manager/task_manager_worker_resource_provider.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_WORKER_PREFIX, title_); 103 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_WORKER_PREFIX, title_);
104 } 104 }
105 105
106 string16 TaskManagerSharedWorkerResource::GetProfileName() const { 106 string16 TaskManagerSharedWorkerResource::GetProfileName() const {
107 return string16(); 107 return string16();
108 } 108 }
109 109
110 gfx::ImageSkia TaskManagerSharedWorkerResource::GetIcon() const { 110 gfx::ImageSkia TaskManagerSharedWorkerResource::GetIcon() const {
111 if (!default_icon_) { 111 if (!default_icon_) {
112 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 112 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
113 default_icon_ = rb.GetImageSkiaNamed(IDR_PLUGIN); 113 default_icon_ = rb.GetImageSkiaNamed(IDR_PLUGINS_FAVICON);
114 // TODO(jabdelmalek): use different icon for web workers. 114 // TODO(jabdelmalek): use different icon for web workers.
115 } 115 }
116 return *default_icon_; 116 return *default_icon_;
117 } 117 }
118 118
119 base::ProcessHandle TaskManagerSharedWorkerResource::GetProcess() const { 119 base::ProcessHandle TaskManagerSharedWorkerResource::GetProcess() const {
120 return handle_; 120 return handle_;
121 } 121 }
122 122
123 int TaskManagerSharedWorkerResource::GetUniqueChildProcessId() const { 123 int TaskManagerSharedWorkerResource::GetUniqueChildProcessId() const {
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 int process_id = resource->process_id(); 355 int process_id = resource->process_id();
356 launching_workers_[process_id].push_back(resource); 356 launching_workers_[process_id].push_back(resource);
357 } else { 357 } else {
358 task_manager_->AddResource(resource); 358 task_manager_->AddResource(resource);
359 } 359 }
360 } 360 }
361 361
362 void TaskManagerWorkerResourceProvider::DeleteAllResources() { 362 void TaskManagerWorkerResourceProvider::DeleteAllResources() {
363 STLDeleteElements(&resources_); 363 STLDeleteElements(&resources_);
364 } 364 }
OLDNEW
« no previous file with comments | « chrome/browser/task_manager/task_manager_resource_providers.cc ('k') | chrome/browser/ui/webui/flags_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698