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

Side by Side Diff: content/app/content_main_runner.cc

Issue 2733283002: Require explicit selection of traits for LazyInstance (Closed)
Patch Set: Created 3 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
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_runner.h" 5 #include "content/public/app/content_main_runner.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <string.h> 9 #include <string.h>
10 10
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 gin::V8Initializer::LoadV8Snapshot(); 219 gin::V8Initializer::LoadV8Snapshot();
220 gin::V8Initializer::LoadV8Natives(); 220 gin::V8Initializer::LoadV8Natives();
221 #endif // !CHROME_MULTIPLE_DLL_BROWSER 221 #endif // !CHROME_MULTIPLE_DLL_BROWSER
222 #endif // OS_POSIX && !OS_MACOSX 222 #endif // OS_POSIX && !OS_MACOSX
223 #endif // V8_USE_EXTERNAL_STARTUP_DATA 223 #endif // V8_USE_EXTERNAL_STARTUP_DATA
224 } 224 }
225 225
226 } // namespace 226 } // namespace
227 227
228 #if !defined(CHROME_MULTIPLE_DLL_CHILD) 228 #if !defined(CHROME_MULTIPLE_DLL_CHILD)
229 base::LazyInstance<ContentBrowserClient> 229 base::LazyInstance<ContentBrowserClient>::DestructorAtExit
230 g_empty_content_browser_client = LAZY_INSTANCE_INITIALIZER; 230 g_empty_content_browser_client = LAZY_INSTANCE_INITIALIZER;
231 #endif // !CHROME_MULTIPLE_DLL_CHILD 231 #endif // !CHROME_MULTIPLE_DLL_CHILD
232 232
233 #if !defined(CHROME_MULTIPLE_DLL_BROWSER) 233 #if !defined(CHROME_MULTIPLE_DLL_BROWSER)
234 base::LazyInstance<ContentGpuClient> 234 base::LazyInstance<ContentGpuClient>::DestructorAtExit
235 g_empty_content_gpu_client = LAZY_INSTANCE_INITIALIZER; 235 g_empty_content_gpu_client = LAZY_INSTANCE_INITIALIZER;
236 base::LazyInstance<ContentRendererClient> 236 base::LazyInstance<ContentRendererClient>::DestructorAtExit
237 g_empty_content_renderer_client = LAZY_INSTANCE_INITIALIZER; 237 g_empty_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
238 base::LazyInstance<ContentUtilityClient> 238 base::LazyInstance<ContentUtilityClient>::DestructorAtExit
239 g_empty_content_utility_client = LAZY_INSTANCE_INITIALIZER; 239 g_empty_content_utility_client = LAZY_INSTANCE_INITIALIZER;
240 #endif // !CHROME_MULTIPLE_DLL_BROWSER 240 #endif // !CHROME_MULTIPLE_DLL_BROWSER
241 241
242 #if defined(OS_POSIX) 242 #if defined(OS_POSIX)
243 243
244 // Setup signal-handling state: resanitize most signals, ignore SIGPIPE. 244 // Setup signal-handling state: resanitize most signals, ignore SIGPIPE.
245 void SetupSignalHandlers() { 245 void SetupSignalHandlers() {
246 // Sanitise our signal handling state. Signals that were ignored by our 246 // Sanitise our signal handling state. Signals that were ignored by our
247 // parent will also be ignored by us. We also inherit our parent's sigmask. 247 // parent will also be ignored by us. We also inherit our parent's sigmask.
248 sigset_t empty_signal_set; 248 sigset_t empty_signal_set;
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after
896 896
897 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); 897 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
898 }; 898 };
899 899
900 // static 900 // static
901 ContentMainRunner* ContentMainRunner::Create() { 901 ContentMainRunner* ContentMainRunner::Create() {
902 return new ContentMainRunnerImpl(); 902 return new ContentMainRunnerImpl();
903 } 903 }
904 904
905 } // namespace content 905 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698