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

Side by Side Diff: content/public/app/content_main_delegate.cc

Issue 999883002: Profiler-instrumentation of the startup time. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Correct format error. Created 5 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
« no previous file with comments | « content/public/app/content_main_delegate.h ('k') | 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 "content/public/app/content_main_delegate.h" 5 #include "content/public/app/content_main_delegate.h"
6 6
7 #if !defined(CHROME_MULTIPLE_DLL_CHILD) 7 #if !defined(CHROME_MULTIPLE_DLL_CHILD)
8 #include "content/public/browser/content_browser_client.h" 8 #include "content/public/browser/content_browser_client.h"
9 #endif 9 #endif
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 } 43 }
44 44
45 #elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_IOS) 45 #elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_IOS)
46 46
47 void ContentMainDelegate::ZygoteStarting( 47 void ContentMainDelegate::ZygoteStarting(
48 ScopedVector<ZygoteForkDelegate>* delegates) { 48 ScopedVector<ZygoteForkDelegate>* delegates) {
49 } 49 }
50 50
51 #endif 51 #endif
52 52
53 bool ContentMainDelegate::ShouldEnableProfilerRecording() {
54 return false;
55 }
56
53 ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() { 57 ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() {
54 #if defined(CHROME_MULTIPLE_DLL_CHILD) 58 #if defined(CHROME_MULTIPLE_DLL_CHILD)
55 return NULL; 59 return NULL;
56 #else 60 #else
57 return new ContentBrowserClient(); 61 return new ContentBrowserClient();
58 #endif 62 #endif
59 } 63 }
60 64
61 ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() { 65 ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() {
62 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER) 66 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER)
(...skipping 13 matching lines...) Expand all
76 80
77 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() { 81 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() {
78 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER) 82 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER)
79 return NULL; 83 return NULL;
80 #else 84 #else
81 return new ContentUtilityClient(); 85 return new ContentUtilityClient();
82 #endif 86 #endif
83 } 87 }
84 88
85 } // namespace content 89 } // namespace content
OLDNEW
« no previous file with comments | « content/public/app/content_main_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698