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

Side by Side Diff: chrome/renderer/chrome_render_process_observer.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/ui/webui/about_ui.cc ('k') | content/browser/zygote_host_impl_linux.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/renderer/chrome_render_process_observer.h" 5 #include "chrome/renderer/chrome_render_process_observer.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 15 matching lines...) Expand all
26 #include "content/public/common/resource_dispatcher_delegate.h" 26 #include "content/public/common/resource_dispatcher_delegate.h"
27 #include "content/public/renderer/render_thread.h" 27 #include "content/public/renderer/render_thread.h"
28 #include "content/public/renderer/render_view_visitor.h" 28 #include "content/public/renderer/render_view_visitor.h"
29 #include "content/public/renderer/render_view.h" 29 #include "content/public/renderer/render_view.h"
30 #include "crypto/nss_util.h" 30 #include "crypto/nss_util.h"
31 #include "media/base/media.h" 31 #include "media/base/media.h"
32 #include "media/base/media_switches.h" 32 #include "media/base/media_switches.h"
33 #include "net/base/net_errors.h" 33 #include "net/base/net_errors.h"
34 #include "net/base/net_module.h" 34 #include "net/base/net_module.h"
35 #include "third_party/sqlite/sqlite3.h" 35 #include "third_party/sqlite/sqlite3.h"
36 #include "third_party/tcmalloc/chromium/src/google/heap-profiler.h" 36 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
37 #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h" 37 #include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h"
38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" 38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCrossOriginPreflig htResultCache.h" 39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCrossOriginPreflig htResultCache.h"
40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" 40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFontCache.h" 41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFontCache.h"
42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" 43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
45 #include "v8/include/v8.h" 45 #include "v8/include/v8.h"
46 46
47 #if defined(OS_WIN) 47 #if defined(OS_WIN)
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 if (clear_cache_pending_) { 386 if (clear_cache_pending_) {
387 clear_cache_pending_ = false; 387 clear_cache_pending_ = false;
388 WebCache::clear(); 388 WebCache::clear();
389 } 389 }
390 } 390 }
391 391
392 const RendererContentSettingRules* 392 const RendererContentSettingRules*
393 ChromeRenderProcessObserver::content_setting_rules() const { 393 ChromeRenderProcessObserver::content_setting_rules() const {
394 return &content_setting_rules_; 394 return &content_setting_rules_;
395 } 395 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/about_ui.cc ('k') | content/browser/zygote_host_impl_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698