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

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

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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) 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.h" 5 #include "chrome/browser/task_manager/task_manager.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h"
9 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
10 #include "base/i18n/number_formatting.h" 9 #include "base/i18n/number_formatting.h"
11 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
12 #include "base/process_util.h" 11 #include "base/process_util.h"
13 #include "base/string_number_conversions.h" 12 #include "base/string_number_conversions.h"
14 #include "base/string_util.h" 13 #include "base/string_util.h"
15 #include "base/threading/thread.h" 14 #include "base/threading/thread.h"
16 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
17 #include "chrome/browser/browser_list.h" 16 #include "chrome/browser/browser_list.h"
18 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/browser_thread.h" 18 #include "chrome/browser/browser_thread.h"
20 #include "chrome/browser/browser_window.h" 19 #include "chrome/browser/browser_window.h"
21 #include "chrome/browser/net/url_request_tracking.h" 20 #include "chrome/browser/net/url_request_tracking.h"
22 #include "chrome/browser/prefs/pref_service.h" 21 #include "chrome/browser/prefs/pref_service.h"
23 #include "chrome/browser/profiles/profile_manager.h" 22 #include "chrome/browser/profiles/profile_manager.h"
24 #include "chrome/browser/renderer_host/render_process_host.h" 23 #include "chrome/browser/renderer_host/render_process_host.h"
25 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" 24 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
26 #include "chrome/browser/tab_contents/tab_contents.h" 25 #include "chrome/browser/tab_contents/tab_contents.h"
27 #include "chrome/browser/task_manager/task_manager_resource_providers.h" 26 #include "chrome/browser/task_manager/task_manager_resource_providers.h"
28 #include "chrome/common/pref_names.h" 27 #include "chrome/common/pref_names.h"
29 #include "chrome/common/result_codes.h" 28 #include "chrome/common/result_codes.h"
30 #include "chrome/common/url_constants.h" 29 #include "chrome/common/url_constants.h"
31 #include "grit/app_resources.h" 30 #include "grit/app_resources.h"
32 #include "grit/chromium_strings.h" 31 #include "grit/chromium_strings.h"
33 #include "grit/generated_resources.h" 32 #include "grit/generated_resources.h"
34 #include "net/url_request/url_request.h" 33 #include "net/url_request/url_request.h"
35 #include "net/url_request/url_request_job.h" 34 #include "net/url_request/url_request_job.h"
35 #include "ui/base/resource/resource_bundle.h"
36 #include "unicode/coll.h" 36 #include "unicode/coll.h"
37 37
38 #if defined(OS_MACOSX) 38 #if defined(OS_MACOSX)
39 #include "chrome/browser/mach_broker_mac.h" 39 #include "chrome/browser/mach_broker_mac.h"
40 #endif 40 #endif
41 41
42 namespace { 42 namespace {
43 43
44 // The delay between updates of the information (in ms). 44 // The delay between updates of the information (in ms).
45 #if defined(OS_MACOSX) 45 #if defined(OS_MACOSX)
(...skipping 988 matching lines...) Expand 10 before | Expand all | Expand 10 after
1034 MetricsMap::const_iterator iter = metrics_map_.find(handle); 1034 MetricsMap::const_iterator iter = metrics_map_.find(handle);
1035 if (iter == metrics_map_.end()) 1035 if (iter == metrics_map_.end())
1036 return false; 1036 return false;
1037 1037
1038 if (!iter->second->GetMemoryBytes(&usage->first, &usage->second)) 1038 if (!iter->second->GetMemoryBytes(&usage->first, &usage->second))
1039 return false; 1039 return false;
1040 1040
1041 memory_usage_map_.insert(std::make_pair(handle, *usage)); 1041 memory_usage_map_.insert(std::make_pair(handle, *usage));
1042 return true; 1042 return true;
1043 } 1043 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/tab_contents_ssl_helper.cc ('k') | chrome/browser/task_manager/task_manager_resource_providers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698