OLD | NEW |
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 #include "content/public/browser/content_browser_client.h" | 7 #include "content/public/browser/content_browser_client.h" |
8 | 8 |
9 #if !defined(OS_IOS) | 9 #if !defined(OS_IOS) |
10 #include "content/public/plugin/content_plugin_client.h" | 10 #include "content/public/plugin/content_plugin_client.h" |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 } | 65 } |
66 | 66 |
67 ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() { | 67 ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() { |
68 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER) | 68 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER) |
69 return NULL; | 69 return NULL; |
70 #else | 70 #else |
71 return new ContentRendererClient(); | 71 return new ContentRendererClient(); |
72 #endif | 72 #endif |
73 } | 73 } |
74 | 74 |
| 75 void ContentMainDelegate::SetStartupObserver( |
| 76 scoped_ptr<StartupTaskRunner::Observer> observer) { |
| 77 startup_observer_ = observer.Pass(); |
| 78 } |
| 79 |
75 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() { | 80 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() { |
76 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER) | 81 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER) |
77 return NULL; | 82 return NULL; |
78 #else | 83 #else |
79 return new ContentUtilityClient(); | 84 return new ContentUtilityClient(); |
80 #endif | 85 #endif |
81 } | 86 } |
82 | 87 |
| 88 StartupTaskRunner::Observer* ContentMainDelegate::GetStartupObserver() { |
| 89 return startup_observer_.get(); |
| 90 } |
| 91 |
83 } // namespace content | 92 } // namespace content |
OLD | NEW |