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

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

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/file_version_info.h" 12 #include "base/file_version_info.h"
13 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
14 #include "base/mac/mac_util.h" 14 #include "base/mac/mac_util.h"
15 #include "base/process/process_iterator.h" 15 #include "base/process/process_iterator.h"
16 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
17 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
18 #include "base/threading/thread.h" 18 #include "base/threading/thread.h"
19 #include "chrome/browser/process_info_snapshot.h" 19 #include "chrome/browser/process_info_snapshot.h"
20 #include "chrome/common/chrome_constants.h" 20 #include "chrome/common/chrome_constants.h"
21 #include "chrome/common/chrome_version_info.h" 21 #include "chrome/common/chrome_version_info.h"
22 #include "chrome/common/url_constants.h" 22 #include "chrome/common/url_constants.h"
23 #include "chrome/grit/chromium_strings.h"
23 #include "content/public/browser/browser_thread.h" 24 #include "content/public/browser/browser_thread.h"
24 #include "content/public/common/process_type.h" 25 #include "content/public/common/process_type.h"
25 #include "grit/chromium_strings.h"
26 #include "ui/base/l10n/l10n_util.h" 26 #include "ui/base/l10n/l10n_util.h"
27 27
28 using content::BrowserThread; 28 using content::BrowserThread;
29 29
30 // TODO(viettrungluu): Many of the TODOs below are subsumed by a general need to 30 // TODO(viettrungluu): Many of the TODOs below are subsumed by a general need to
31 // refactor the about:memory code (not just on Mac, but probably on other 31 // refactor the about:memory code (not just on Mac, but probably on other
32 // platforms as well). I've filed crbug.com/25456. 32 // platforms as well). I've filed crbug.com/25456.
33 33
34 // Known browsers which we collect details for. |CHROME_BROWSER| *must* be the 34 // Known browsers which we collect details for. |CHROME_BROWSER| *must* be the
35 // first browser listed. The order here must match those in |process_template| 35 // first browser listed. The order here must match those in |process_template|
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 } 233 }
234 } 234 }
235 235
236 // Memory info. 236 // Memory info.
237 process_info.GetCommittedKBytesOfPID(info.pid, &info.committed); 237 process_info.GetCommittedKBytesOfPID(info.pid, &info.committed);
238 process_info.GetWorkingSetKBytesOfPID(info.pid, &info.working_set); 238 process_info.GetWorkingSetKBytesOfPID(info.pid, &info.working_set);
239 239
240 // Add the process info to our list. 240 // Add the process info to our list.
241 process_data_[CHROME_BROWSER].processes.push_back(info); 241 process_data_[CHROME_BROWSER].processes.push_back(info);
242 } 242 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698