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

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

Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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.cc ('k') | chrome/browser/memory_details_mac.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) 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 <sys/types.h> 7 #include <sys/types.h>
8 #include <unistd.h> 8 #include <unistd.h>
9 9
10 #include <map> 10 #include <map>
11 #include <set> 11 #include <set>
12 12
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/process_util.h" 14 #include "base/process_util.h"
15 #include "base/string_util.h" 15 #include "base/string_util.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "chrome/common/chrome_constants.h" 17 #include "chrome/common/chrome_constants.h"
18 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
19 #include "content/public/common/process_type.h" 19 #include "content/public/common/process_type.h"
20 #include "grit/chromium_strings.h" 20 #include "grit/chromium_strings.h"
21 #include "ui/base/l10n/l10n_util.h" 21 #include "ui/base/l10n/l10n_util.h"
22 22
23 using base::ProcessEntry; 23 using base::ProcessEntry;
24 using content::BrowserThread; 24 using content::BrowserThread;
25 25
26 // Known browsers which we collect details for. 26 // Known browsers which we collect details for.
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 if (type != MAX_BROWSERS) 228 if (type != MAX_BROWSERS)
229 browser.name = ASCIIToUTF16(kBrowserPrettyNames[type]); 229 browser.name = ASCIIToUTF16(kBrowserPrettyNames[type]);
230 process_data_.push_back(browser); 230 process_data_.push_back(browser);
231 } 231 }
232 232
233 // Finally return to the browser thread. 233 // Finally return to the browser thread.
234 BrowserThread::PostTask( 234 BrowserThread::PostTask(
235 BrowserThread::UI, FROM_HERE, 235 BrowserThread::UI, FROM_HERE,
236 base::Bind(&MemoryDetails::CollectChildInfoOnUIThread, this)); 236 base::Bind(&MemoryDetails::CollectChildInfoOnUIThread, this));
237 } 237 }
OLDNEW
« no previous file with comments | « chrome/browser/memory_details.cc ('k') | chrome/browser/memory_details_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698