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

Side by Side Diff: chrome/renderer/chrome_render_process_observer.cc

Issue 10389187: Fix build without tcmalloc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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/renderer/chrome_render_process_observer.h" 5 #include "chrome/renderer/chrome_render_process_observer.h"
6 6
7 #include "base/allocator/allocator_extension.h" 7 #include "base/allocator/allocator_extension.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 17 matching lines...) Expand all
28 #include "chrome/renderer/security_filter_peer.h" 28 #include "chrome/renderer/security_filter_peer.h"
29 #include "content/public/common/resource_dispatcher_delegate.h" 29 #include "content/public/common/resource_dispatcher_delegate.h"
30 #include "content/public/renderer/render_thread.h" 30 #include "content/public/renderer/render_thread.h"
31 #include "content/public/renderer/render_view_visitor.h" 31 #include "content/public/renderer/render_view_visitor.h"
32 #include "content/public/renderer/render_view.h" 32 #include "content/public/renderer/render_view.h"
33 #include "crypto/nss_util.h" 33 #include "crypto/nss_util.h"
34 #include "media/base/media_switches.h" 34 #include "media/base/media_switches.h"
35 #include "net/base/net_errors.h" 35 #include "net/base/net_errors.h"
36 #include "net/base/net_module.h" 36 #include "net/base/net_module.h"
37 #include "third_party/sqlite/sqlite3.h" 37 #include "third_party/sqlite/sqlite3.h"
38 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" 38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCrossOriginPreflig htResultCache.h" 39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCrossOriginPreflig htResultCache.h"
41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" 40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFontCache.h" 41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFontCache.h"
43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" 43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
45 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
46 #include "v8/include/v8.h" 45 #include "v8/include/v8.h"
47 46
48 #if defined(OS_WIN) 47 #if defined(OS_WIN)
49 #include "base/win/iat_patch_function.h" 48 #include "base/win/iat_patch_function.h"
50 #endif 49 #endif
51 50
51 #if defined(USE_TCMALLOC)
52 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
53 #endif
54
52 using WebKit::WebCache; 55 using WebKit::WebCache;
53 using WebKit::WebCrossOriginPreflightResultCache; 56 using WebKit::WebCrossOriginPreflightResultCache;
54 using WebKit::WebFontCache; 57 using WebKit::WebFontCache;
55 using WebKit::WebRuntimeFeatures; 58 using WebKit::WebRuntimeFeatures;
56 using content::RenderThread; 59 using content::RenderThread;
57 60
58 namespace { 61 namespace {
59 62
60 static const int kCacheStatsDelayMS = 2000; 63 static const int kCacheStatsDelayMS = 2000;
61 64
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 if (clear_cache_pending_) { 343 if (clear_cache_pending_) {
341 clear_cache_pending_ = false; 344 clear_cache_pending_ = false;
342 WebCache::clear(); 345 WebCache::clear();
343 } 346 }
344 } 347 }
345 348
346 const RendererContentSettingRules* 349 const RendererContentSettingRules*
347 ChromeRenderProcessObserver::content_setting_rules() const { 350 ChromeRenderProcessObserver::content_setting_rules() const {
348 return &content_setting_rules_; 351 return &content_setting_rules_;
349 } 352 }
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