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

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

Issue 3007008: Cleanup: Break another common->app dependency. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: minor fix Created 10 years, 5 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
« no previous file with comments | « chrome/browser/memory_details_mac.cc ('k') | chrome/browser/metrics/metrics_log.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) 2006-2008 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/memory_details.h" 5 #include "chrome/browser/memory_details.h"
6 #include <psapi.h> 6 #include <psapi.h>
7 7
8 #include "app/l10n_util.h" 8 #include "app/l10n_util.h"
9 #include "base/file_version_info.h" 9 #include "base/file_version_info.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
11 #include "chrome/app/chrome_version_info.h"
12 #include "chrome/browser/browser_child_process_host.h" 11 #include "chrome/browser/browser_child_process_host.h"
13 #include "chrome/browser/chrome_thread.h" 12 #include "chrome/browser/chrome_thread.h"
14 #include "chrome/browser/renderer_host/backing_store_manager.h" 13 #include "chrome/browser/renderer_host/backing_store_manager.h"
15 #include "chrome/browser/renderer_host/render_process_host.h" 14 #include "chrome/browser/renderer_host/render_process_host.h"
16 #include "chrome/browser/tab_contents/navigation_entry.h" 15 #include "chrome/browser/tab_contents/navigation_entry.h"
17 #include "chrome/browser/tab_contents/tab_contents.h" 16 #include "chrome/browser/tab_contents/tab_contents.h"
17 #include "chrome/common/chrome_version_info.h"
18 #include "chrome/common/url_constants.h" 18 #include "chrome/common/url_constants.h"
19 #include "grit/chromium_strings.h" 19 #include "grit/chromium_strings.h"
20 20
21 // Known browsers which we collect details for. 21 // Known browsers which we collect details for.
22 enum { 22 enum {
23 CHROME_BROWSER = 0, 23 CHROME_BROWSER = 0,
24 CHROME_NACL_PROCESS, 24 CHROME_NACL_PROCESS,
25 IE_BROWSER, 25 IE_BROWSER,
26 FIREFOX_BROWSER, 26 FIREFOX_BROWSER,
27 OPERA_BROWSER, 27 OPERA_BROWSER,
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 115
116 scoped_ptr<base::ProcessMetrics> metrics; 116 scoped_ptr<base::ProcessMetrics> metrics;
117 metrics.reset(base::ProcessMetrics::CreateProcessMetrics(handle)); 117 metrics.reset(base::ProcessMetrics::CreateProcessMetrics(handle));
118 metrics->GetCommittedKBytes(&info.committed); 118 metrics->GetCommittedKBytes(&info.committed);
119 metrics->GetWorkingSetKBytes(&info.working_set); 119 metrics->GetWorkingSetKBytes(&info.working_set);
120 120
121 // Get Version Information. 121 // Get Version Information.
122 TCHAR name[MAX_PATH]; 122 TCHAR name[MAX_PATH];
123 if (index2 == CHROME_BROWSER || index2 == CHROME_NACL_PROCESS) { 123 if (index2 == CHROME_BROWSER || index2 == CHROME_NACL_PROCESS) {
124 scoped_ptr<FileVersionInfo> version_info( 124 scoped_ptr<FileVersionInfo> version_info(
125 chrome_app::GetChromeVersionInfo()); 125 chrome::GetChromeVersionInfo());
126 if (version_info != NULL) 126 if (version_info != NULL)
127 info.version = version_info->file_version(); 127 info.version = version_info->file_version();
128 // Check if this is one of the child processes whose data we collected 128 // Check if this is one of the child processes whose data we collected
129 // on the IO thread, and if so copy over that data. 129 // on the IO thread, and if so copy over that data.
130 for (size_t child = 0; child < child_info.size(); child++) { 130 for (size_t child = 0; child < child_info.size(); child++) {
131 if (child_info[child].pid != info.pid) 131 if (child_info[child].pid != info.pid)
132 continue; 132 continue;
133 info.titles = child_info[child].titles; 133 info.titles = child_info[child].titles;
134 info.type = child_info[child].type; 134 info.type = child_info[child].type;
135 break; 135 break;
(...skipping 17 matching lines...) Expand all
153 } 153 }
154 break; 154 break;
155 } 155 }
156 } while (::Process32Next(snapshot, &process_entry)); 156 } while (::Process32Next(snapshot, &process_entry));
157 157
158 // Finally return to the browser thread. 158 // Finally return to the browser thread.
159 ChromeThread::PostTask( 159 ChromeThread::PostTask(
160 ChromeThread::UI, FROM_HERE, 160 ChromeThread::UI, FROM_HERE,
161 NewRunnableMethod(this, &MemoryDetails::CollectChildInfoOnUIThread)); 161 NewRunnableMethod(this, &MemoryDetails::CollectChildInfoOnUIThread));
162 } 162 }
OLDNEW
« no previous file with comments | « chrome/browser/memory_details_mac.cc ('k') | chrome/browser/metrics/metrics_log.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698