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

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

Issue 1560027: Refactor FileVersionInfo into an interface with platform implementations. (Closed)
Patch Set: comments Created 10 years, 8 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/gtk/about_chrome_dialog.cc ('k') | chrome/browser/memory_details_win.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/memory_details.h" 5 #include "chrome/browser/memory_details.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 9
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/file_path.h" 12 #include "base/file_path.h"
13 #include "base/file_version_info.h" 13 #include "base/file_version_info.h"
14 #include "base/mac_util.h" 14 #include "base/mac_util.h"
15 #include "base/string_util.h" 15 #include "base/string_util.h"
16 #include "base/process_util.h" 16 #include "base/process_util.h"
17 #include "base/thread.h" 17 #include "base/thread.h"
18 #include "chrome/app/chrome_version_info.h"
18 #include "chrome/browser/browser_process.h" 19 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/child_process_host.h" 20 #include "chrome/browser/child_process_host.h"
20 #include "chrome/browser/chrome_thread.h" 21 #include "chrome/browser/chrome_thread.h"
21 #include "chrome/browser/process_info_snapshot.h" 22 #include "chrome/browser/process_info_snapshot.h"
22 #include "chrome/browser/renderer_host/backing_store_manager.h" 23 #include "chrome/browser/renderer_host/backing_store_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/tab_contents/navigation_entry.h" 25 #include "chrome/browser/tab_contents/navigation_entry.h"
25 #include "chrome/browser/tab_contents/tab_contents.h" 26 #include "chrome/browser/tab_contents/tab_contents.h"
26 #include "chrome/common/chrome_constants.h" 27 #include "chrome/common/chrome_constants.h"
27 #include "chrome/common/url_constants.h" 28 #include "chrome/common/url_constants.h"
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 base::ProcessId pid, 192 base::ProcessId pid,
192 const ProcessInfoSnapshot& process_info) { 193 const ProcessInfoSnapshot& process_info) {
193 ProcessMemoryInformation info; 194 ProcessMemoryInformation info;
194 info.pid = pid; 195 info.pid = pid;
195 if (info.pid == base::GetCurrentProcId()) 196 if (info.pid == base::GetCurrentProcId())
196 info.type = ChildProcessInfo::BROWSER_PROCESS; 197 info.type = ChildProcessInfo::BROWSER_PROCESS;
197 else 198 else
198 info.type = ChildProcessInfo::UNKNOWN_PROCESS; 199 info.type = ChildProcessInfo::UNKNOWN_PROCESS;
199 200
200 scoped_ptr<FileVersionInfo> version_info( 201 scoped_ptr<FileVersionInfo> version_info(
201 FileVersionInfo::CreateFileVersionInfoForCurrentModule()); 202 chrome_app::GetChromeVersionInfo());
202 if (version_info.get()) { 203 if (version_info.get()) {
203 info.product_name = version_info->product_name(); 204 info.product_name = version_info->product_name();
204 info.version = version_info->product_version(); 205 info.version = version_info->product_version();
205 } else { 206 } else {
206 info.product_name = process_data_[CHROME_BROWSER].name; 207 info.product_name = process_data_[CHROME_BROWSER].name;
207 info.version = L""; 208 info.version = L"";
208 } 209 }
209 210
210 // Check if this is one of the child processes whose data we collected 211 // Check if this is one of the child processes whose data we collected
211 // on the IO thread, and if so copy over that data. 212 // on the IO thread, and if so copy over that data.
212 for (size_t child = 0; child < child_info.size(); child++) { 213 for (size_t child = 0; child < child_info.size(); child++) {
213 if (child_info[child].pid == info.pid) { 214 if (child_info[child].pid == info.pid) {
214 info.titles = child_info[child].titles; 215 info.titles = child_info[child].titles;
215 info.type = child_info[child].type; 216 info.type = child_info[child].type;
216 break; 217 break;
217 } 218 }
218 } 219 }
219 220
220 // Memory info. 221 // Memory info.
221 process_info.GetCommittedKBytesOfPID(info.pid, &info.committed); 222 process_info.GetCommittedKBytesOfPID(info.pid, &info.committed);
222 process_info.GetWorkingSetKBytesOfPID(info.pid, &info.working_set); 223 process_info.GetWorkingSetKBytesOfPID(info.pid, &info.working_set);
223 224
224 // Add the process info to our list. 225 // Add the process info to our list.
225 process_data_[CHROME_BROWSER].processes.push_back(info); 226 process_data_[CHROME_BROWSER].processes.push_back(info);
226 } 227 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/about_chrome_dialog.cc ('k') | chrome/browser/memory_details_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698