summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/webui
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-02 16:12:45 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-02 16:12:45 +0000
commitabd81a52d199829920aabd221f2ebaf2e210fbfa (patch)
treec67639ededc0c990699f55e54937f845ff382d98 /chrome/browser/ui/webui
parent41247fdcdeceecef93a0f04f2240abf0e4b4e283 (diff)
downloadchromium_src-abd81a52d199829920aabd221f2ebaf2e210fbfa.zip
chromium_src-abd81a52d199829920aabd221f2ebaf2e210fbfa.tar.gz
chromium_src-abd81a52d199829920aabd221f2ebaf2e210fbfa.tar.bz2
Cleanup: Typedef std::pairs in TaskManager code. Also making goat teleporting thread safe!
BUG=none TEST=none Review URL: http://codereview.chromium.org/9565041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui')
-rw-r--r--chrome/browser/ui/webui/task_manager_handler.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/ui/webui/task_manager_handler.cc b/chrome/browser/ui/webui/task_manager_handler.cc
index 23eeda1..048e937 100644
--- a/chrome/browser/ui/webui/task_manager_handler.cc
+++ b/chrome/browser/ui/webui/task_manager_handler.cc
@@ -6,6 +6,7 @@
#include <algorithm>
#include <functional>
+
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/string_number_conversions.h"
@@ -26,7 +27,7 @@
namespace {
Value* CreateColumnValue(const TaskManagerModel* tm,
- const std::string column_name,
+ const std::string& column_name,
const int i) {
if (column_name == "uniqueId")
return Value::CreateIntegerValue(tm->GetResourceUniqueId(i));
@@ -134,7 +135,7 @@ void CreateGroupColumnList(const TaskManagerModel* tm,
const int index,
const int length,
DictionaryValue* val) {
- ListValue *list = new ListValue();
+ ListValue* list = new ListValue();
for (int i = index; i < (index + length); ++i) {
list->Append(CreateColumnValue(tm, column_name, i));
}
@@ -184,9 +185,7 @@ DictionaryValue* CreateTaskGroupValue(
return val;
int index = tm->GetResourceIndexForGroup(group_index, 0);
- std::pair<int, int> group_range;
- group_range = tm->GetGroupRangeForResource(index);
- int length = group_range.second;
+ int length = tm->GetGroupRangeForResource(index).second;
// Forces to set following 3 columns regardless of |enable_columns|.
val->SetInteger("index", index);