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

Side by Side Diff: chrome/browser/chromeos/status/memory_menu_button.cc

Issue 9311003: Update the tcmalloc chromium branch to r144 (gperftools 2.0), and merge chromium-specific changes. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Rebasec Created 8 years, 9 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/browser_about_handler.cc ('k') | chrome/browser/memory_purger.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 // Note: this file is used by Aura on all linux platforms, even though it 5 // Note: this file is used by Aura on all linux platforms, even though it
6 // is currently in a chromeos specific location. 6 // is currently in a chromeos specific location.
7 7
8 #include "chrome/browser/chromeos/status/memory_menu_button.h" 8 #include "chrome/browser/chromeos/status/memory_menu_button.h"
9 9
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/process_util.h" // GetSystemMemoryInfo 11 #include "base/process_util.h" // GetSystemMemoryInfo
12 #include "base/stringprintf.h" 12 #include "base/stringprintf.h"
13 #include "base/threading/thread_restrictions.h" 13 #include "base/threading/thread_restrictions.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "chrome/browser/chromeos/view_ids.h" 15 #include "chrome/browser/chromeos/view_ids.h"
16 #include "chrome/browser/memory_purger.h" 16 #include "chrome/browser/memory_purger.h"
17 #include "chrome/common/render_messages.h" 17 #include "chrome/common/render_messages.h"
18 #include "content/public/browser/notification_service.h" 18 #include "content/public/browser/notification_service.h"
19 #include "content/public/browser/notification_types.h" 19 #include "content/public/browser/notification_types.h"
20 #include "content/public/browser/render_process_host.h" 20 #include "content/public/browser/render_process_host.h"
21 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
22 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
23 #include "ui/views/controls/menu/menu_runner.h" 23 #include "ui/views/controls/menu/menu_runner.h"
24 #include "ui/views/widget/widget.h" 24 #include "ui/views/widget/widget.h"
25 25
26 #if defined(USE_TCMALLOC) 26 #if defined(USE_TCMALLOC)
27 #include "third_party/tcmalloc/chromium/src/google/heap-profiler.h" 27 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
28 #endif 28 #endif
29 29
30 #if defined(USE_TCMALLOC) 30 #if defined(USE_TCMALLOC)
31 const char kProfileDumpFilePrefix[] = "/tmp/chrome_tcmalloc"; 31 const char kProfileDumpFilePrefix[] = "/tmp/chrome_tcmalloc";
32 #endif 32 #endif
33 33
34 namespace { 34 namespace {
35 35
36 // views::MenuItemView item ids 36 // views::MenuItemView item ids
37 enum { 37 enum {
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 // A kill is a very interesting event, so repaint immediately. 272 // A kill is a very interesting event, so repaint immediately.
273 UpdateText(); 273 UpdateText();
274 } 274 }
275 break; 275 break;
276 } 276 }
277 default: 277 default:
278 NOTREACHED() << L"Received unexpected notification"; 278 NOTREACHED() << L"Received unexpected notification";
279 break; 279 break;
280 } 280 }
281 } 281 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/memory_purger.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698