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

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

Issue 8520036: Revert 110262 - Have ExtensionHost use TabContents instead of RenderViewHost. Try #2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_resource_providers.h" 5 #include "chrome/browser/task_manager/task_manager_resource_providers.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/file_version_info.h" 10 #include "base/file_version_info.h"
(...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after
1114 1114
1115 void TaskManagerExtensionProcessResource::SetSupportNetworkUsage() { 1115 void TaskManagerExtensionProcessResource::SetSupportNetworkUsage() {
1116 NOTREACHED(); 1116 NOTREACHED();
1117 } 1117 }
1118 1118
1119 const Extension* TaskManagerExtensionProcessResource::GetExtension() const { 1119 const Extension* TaskManagerExtensionProcessResource::GetExtension() const {
1120 return extension_host_->extension(); 1120 return extension_host_->extension();
1121 } 1121 }
1122 1122
1123 bool TaskManagerExtensionProcessResource::IsBackground() const { 1123 bool TaskManagerExtensionProcessResource::IsBackground() const {
1124 return extension_host_->extension_host_type() == 1124 return extension_host_->GetRenderViewType() ==
1125 chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE; 1125 chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE;
1126 } 1126 }
1127 1127
1128 //////////////////////////////////////////////////////////////////////////////// 1128 ////////////////////////////////////////////////////////////////////////////////
1129 // TaskManagerExtensionProcessResourceProvider class 1129 // TaskManagerExtensionProcessResourceProvider class
1130 //////////////////////////////////////////////////////////////////////////////// 1130 ////////////////////////////////////////////////////////////////////////////////
1131 1131
1132 TaskManagerExtensionProcessResourceProvider:: 1132 TaskManagerExtensionProcessResourceProvider::
1133 TaskManagerExtensionProcessResourceProvider(TaskManager* task_manager) 1133 TaskManagerExtensionProcessResourceProvider(TaskManager* task_manager)
1134 : task_manager_(task_manager), 1134 : task_manager_(task_manager),
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
1389 1389
1390 return &resource_; 1390 return &resource_;
1391 } 1391 }
1392 1392
1393 void TaskManagerBrowserProcessResourceProvider::StartUpdating() { 1393 void TaskManagerBrowserProcessResourceProvider::StartUpdating() {
1394 task_manager_->AddResource(&resource_); 1394 task_manager_->AddResource(&resource_);
1395 } 1395 }
1396 1396
1397 void TaskManagerBrowserProcessResourceProvider::StopUpdating() { 1397 void TaskManagerBrowserProcessResourceProvider::StopUpdating() {
1398 } 1398 }
OLDNEW
« no previous file with comments | « chrome/browser/task_manager/task_manager.cc ('k') | chrome/browser/ui/cocoa/extensions/extension_view_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698