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

Unified Diff: chrome/browser/task_manager/task_manager.cc

Issue 549263002: Task Manager: Remove goat teleporter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/task_manager/task_manager.h ('k') | chrome/browser/ui/cocoa/task_manager_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/task_manager/task_manager.cc
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index 9919563bde71a90c83c4a493339f310228485804..9c91dc03498ad3da2ec51e4e47b769d93a719553 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -9,7 +9,6 @@
#include "base/i18n/rtl.h"
#include "base/prefs/pref_registry_simple.h"
#include "base/process/process_metrics.h"
-#include "base/rand_util.h"
#include "base/stl_util.h"
#include "base/strings/string16.h"
#include "base/strings/string_number_conversions.h"
@@ -197,8 +196,6 @@ TaskManagerModel::PerResourceValues::PerResourceValues()
network_usage(0),
is_process_id_valid(false),
process_id(0),
- is_goats_teleported_valid(false),
- goats_teleported(0),
is_webcore_stats_valid(false),
is_sqlite_memory_bytes_valid(false),
sqlite_memory_bytes(0),
@@ -241,8 +238,7 @@ TaskManagerModel::TaskManagerModel(TaskManager* task_manager)
update_requests_(0),
listen_requests_(0),
update_state_(IDLE),
- is_updating_byte_count_(false),
- goat_salt_(base::RandUint64()) {
+ is_updating_byte_count_(false) {
AddResourceProvider(
new task_manager::BrowserProcessResourceProvider(task_manager));
AddResourceProvider(new task_manager::WebContentsResourceProvider(
@@ -363,9 +359,6 @@ base::string16 TaskManagerModel::GetResourceById(int index, int col_id) const {
case IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN:
return GetResourceIdleWakeupsPerSecond(index);
- case IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN:
- return GetResourceGoatsTeleported(index);
-
case IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN:
return GetResourceWebCoreImageCacheSize(index);
@@ -529,11 +522,6 @@ base::string16 TaskManagerModel::GetResourceIdleWakeupsPerSecond(int index)
return base::FormatNumber(GetIdleWakeupsPerSecond(GetResource(index)));
}
-base::string16 TaskManagerModel::GetResourceGoatsTeleported(int index) const {
- CHECK_LT(index, ResourceCount());
- return base::FormatNumber(GetGoatsTeleported(index));
-}
-
base::string16 TaskManagerModel::GetResourceV8MemoryAllocatedSize(
int index) const {
size_t memory_allocated = 0, memory_used = 0;
@@ -703,16 +691,6 @@ bool TaskManagerModel::CanActivate(int index) const {
return GetResourceWebContents(index) != NULL;
}
-int TaskManagerModel::GetGoatsTeleported(int index) const {
- PerResourceValues& values(GetPerResourceValues(index));
- if (!values.is_goats_teleported_valid) {
- values.is_goats_teleported_valid = true;
- values.goats_teleported = goat_salt_ * (index + 1);
- values.goats_teleported = (values.goats_teleported >> 16) & 255;
- }
- return values.goats_teleported;
-}
-
bool TaskManagerModel::IsResourceFirstInGroup(int index) const {
Resource* resource = GetResource(index);
GroupMap::const_iterator iter = group_map_.find(resource->GetProcess());
@@ -907,9 +885,6 @@ int TaskManagerModel::CompareValues(int row1, int row2, int col_id) const {
OrderUnavailableValue(value1_valid, value2_valid);
}
- case IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN:
- return ValueCompare(GetGoatsTeleported(row1), GetGoatsTeleported(row2));
-
case IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN:
return ValueCompareMember(
this, &TaskManagerModel::GetV8Memory, row1, row2);
@@ -1145,8 +1120,6 @@ void TaskManagerModel::ModelChanged() {
}
void TaskManagerModel::Refresh() {
- goat_salt_ = base::RandUint64();
-
per_resource_cache_.clear();
per_process_cache_.clear();
« no previous file with comments | « chrome/browser/task_manager/task_manager.h ('k') | chrome/browser/ui/cocoa/task_manager_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698