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

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

Issue 10553031: Fix build error with gcc-4.7 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | « no previous file | no next file » | 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>
8 #include <unistd.h>
9
7 #include <map> 10 #include <map>
8 #include <set> 11 #include <set>
9 12
10 #include "base/bind.h" 13 #include "base/bind.h"
11 #include "base/process_util.h" 14 #include "base/process_util.h"
12 #include "base/string_util.h" 15 #include "base/string_util.h"
13 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
14 #include "chrome/common/chrome_constants.h" 17 #include "chrome/common/chrome_constants.h"
15 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
16 #include "content/public/common/process_type.h" 19 #include "content/public/common/process_type.h"
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 if (type != MAX_BROWSERS) 226 if (type != MAX_BROWSERS)
224 browser.name = ASCIIToUTF16(kBrowserPrettyNames[type]); 227 browser.name = ASCIIToUTF16(kBrowserPrettyNames[type]);
225 process_data_.push_back(browser); 228 process_data_.push_back(browser);
226 } 229 }
227 230
228 // Finally return to the browser thread. 231 // Finally return to the browser thread.
229 BrowserThread::PostTask( 232 BrowserThread::PostTask(
230 BrowserThread::UI, FROM_HERE, 233 BrowserThread::UI, FROM_HERE,
231 base::Bind(&MemoryDetails::CollectChildInfoOnUIThread, this)); 234 base::Bind(&MemoryDetails::CollectChildInfoOnUIThread, this));
232 } 235 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698