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

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

Issue 3145001: FBTF: Clean up task.h in x11_util.h and header usage in some delegates. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: more Created 10 years, 4 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
« no previous file with comments | « chrome/browser/tab_contents/tab_contents_delegate.cc ('k') | chrome/browser/toolbar_model.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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.h" 5 #include "chrome/browser/task_manager.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/i18n/number_formatting.h" 10 #include "base/i18n/number_formatting.h"
11 #include "base/i18n/rtl.h" 11 #include "base/i18n/rtl.h"
12 #include "base/process_util.h" 12 #include "base/process_util.h"
13 #include "base/string_number_conversions.h" 13 #include "base/string_number_conversions.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "base/thread.h" 15 #include "base/thread.h"
16 #include "base/utf_string_conversions.h"
16 #include "chrome/browser/browser_list.h" 17 #include "chrome/browser/browser_list.h"
17 #include "chrome/browser/browser_process.h" 18 #include "chrome/browser/browser_process.h"
18 #include "chrome/browser/browser_window.h" 19 #include "chrome/browser/browser_window.h"
19 #include "chrome/browser/chrome_thread.h" 20 #include "chrome/browser/chrome_thread.h"
20 #include "chrome/browser/net/url_request_tracking.h" 21 #include "chrome/browser/net/url_request_tracking.h"
21 #include "chrome/browser/pref_service.h" 22 #include "chrome/browser/pref_service.h"
22 #include "chrome/browser/profile_manager.h" 23 #include "chrome/browser/profile_manager.h"
23 #include "chrome/browser/renderer_host/render_process_host.h" 24 #include "chrome/browser/renderer_host/render_process_host.h"
24 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" 25 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
25 #include "chrome/browser/tab_contents/tab_contents.h" 26 #include "chrome/browser/tab_contents/tab_contents.h"
(...skipping 948 matching lines...) Expand 10 before | Expand all | Expand 10 after
974 MetricsMap::const_iterator iter = metrics_map_.find(handle); 975 MetricsMap::const_iterator iter = metrics_map_.find(handle);
975 if (iter == metrics_map_.end()) 976 if (iter == metrics_map_.end())
976 return false; 977 return false;
977 978
978 if (!iter->second->GetMemoryBytes(&usage->first, &usage->second)) 979 if (!iter->second->GetMemoryBytes(&usage->first, &usage->second))
979 return false; 980 return false;
980 981
981 memory_usage_map_.insert(std::make_pair(handle, *usage)); 982 memory_usage_map_.insert(std::make_pair(handle, *usage));
982 return true; 983 return true;
983 } 984 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/tab_contents_delegate.cc ('k') | chrome/browser/toolbar_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698