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_runner.h" | 5 #include "content/public/app/content_main_runner.h" |
6 | 6 |
7 #include "base/allocator/allocator_extension.h" | 7 #include "base/allocator/allocator_extension.h" |
8 #include "base/at_exit.h" | 8 #include "base/at_exit.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/debugger.h" | 10 #include "base/debug/debugger.h" |
(...skipping 30 matching lines...) Expand all Loading... |
41 #include "ui/base/ui_base_switches.h" | 41 #include "ui/base/ui_base_switches.h" |
42 #include "ui/base/ui_base_paths.h" | 42 #include "ui/base/ui_base_paths.h" |
43 #include "ui/base/win/dpi.h" | 43 #include "ui/base/win/dpi.h" |
44 #include "webkit/glue/webkit_glue.h" | 44 #include "webkit/glue/webkit_glue.h" |
45 | 45 |
46 #if defined(USE_TCMALLOC) | 46 #if defined(USE_TCMALLOC) |
47 #include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h" | 47 #include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h" |
48 #endif | 48 #endif |
49 | 49 |
50 #if defined(OS_WIN) | 50 #if defined(OS_WIN) |
| 51 #include <cstring> |
51 #include <atlbase.h> | 52 #include <atlbase.h> |
52 #include <atlapp.h> | 53 #include <atlapp.h> |
53 #include <malloc.h> | 54 #include <malloc.h> |
54 #elif defined(OS_MACOSX) | 55 #elif defined(OS_MACOSX) |
55 #include "base/mac/scoped_nsautorelease_pool.h" | 56 #include "base/mac/scoped_nsautorelease_pool.h" |
56 #include "base/mach_ipc_mac.h" | 57 #include "base/mach_ipc_mac.h" |
57 #include "base/system_monitor/system_monitor.h" | 58 #include "base/system_monitor/system_monitor.h" |
58 #include "content/browser/mach_broker_mac.h" | 59 #include "content/browser/mach_broker_mac.h" |
59 #include "content/common/sandbox_init_mac.h" | 60 #include "content/common/sandbox_init_mac.h" |
60 #endif // OS_WIN | 61 #endif // OS_WIN |
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
391 return 1; | 392 return 1; |
392 } | 393 } |
393 | 394 |
394 class ContentMainRunnerImpl : public ContentMainRunner { | 395 class ContentMainRunnerImpl : public ContentMainRunner { |
395 public: | 396 public: |
396 ContentMainRunnerImpl() | 397 ContentMainRunnerImpl() |
397 : is_initialized_(false), | 398 : is_initialized_(false), |
398 is_shutdown_(false), | 399 is_shutdown_(false), |
399 completed_basic_startup_(false), | 400 completed_basic_startup_(false), |
400 delegate_(NULL) { | 401 delegate_(NULL) { |
| 402 #if defined(OS_WIN) |
| 403 memset(&sandbox_info_, 0, sizeof(sandbox_info_)); |
| 404 #endif |
401 } | 405 } |
402 | 406 |
403 ~ContentMainRunnerImpl() { | 407 ~ContentMainRunnerImpl() { |
404 if (is_initialized_ && !is_shutdown_) | 408 if (is_initialized_ && !is_shutdown_) |
405 Shutdown(); | 409 Shutdown(); |
406 } | 410 } |
407 | 411 |
408 #if defined(USE_TCMALLOC) | 412 #if defined(USE_TCMALLOC) |
409 static void GetStatsThunk(char* buffer, int buffer_length) { | 413 static void GetStatsThunk(char* buffer, int buffer_length) { |
410 MallocExtension::instance()->GetStats(buffer, buffer_length); | 414 MallocExtension::instance()->GetStats(buffer, buffer_length); |
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
685 | 689 |
686 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); | 690 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); |
687 }; | 691 }; |
688 | 692 |
689 // static | 693 // static |
690 ContentMainRunner* ContentMainRunner::Create() { | 694 ContentMainRunner* ContentMainRunner::Create() { |
691 return new ContentMainRunnerImpl(); | 695 return new ContentMainRunnerImpl(); |
692 } | 696 } |
693 | 697 |
694 } // namespace content | 698 } // namespace content |
OLD | NEW |