| 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 <stdlib.h> | 7 #include <stdlib.h> |
| 8 | 8 |
| 9 #include "base/allocator/allocator_extension.h" | 9 #include "base/allocator/allocator_extension.h" |
| 10 #include "base/at_exit.h" | 10 #include "base/at_exit.h" |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 #include <cstring> | 78 #include <cstring> |
| 79 | 79 |
| 80 #include "base/strings/string_number_conversions.h" | 80 #include "base/strings/string_number_conversions.h" |
| 81 #include "base/trace_event/trace_event_etw_export_win.h" | 81 #include "base/trace_event/trace_event_etw_export_win.h" |
| 82 #include "ui/base/win/atl_module.h" | 82 #include "ui/base/win/atl_module.h" |
| 83 #include "ui/gfx/win/dpi.h" | 83 #include "ui/gfx/win/dpi.h" |
| 84 #elif defined(OS_MACOSX) | 84 #elif defined(OS_MACOSX) |
| 85 #include "base/mac/scoped_nsautorelease_pool.h" | 85 #include "base/mac/scoped_nsautorelease_pool.h" |
| 86 #if !defined(OS_IOS) | 86 #if !defined(OS_IOS) |
| 87 #include "base/power_monitor/power_monitor_device_source.h" | 87 #include "base/power_monitor/power_monitor_device_source.h" |
| 88 #include "content/app/mac/mac_init.h" |
| 88 #include "content/browser/mach_broker_mac.h" | 89 #include "content/browser/mach_broker_mac.h" |
| 89 #include "content/common/sandbox_init_mac.h" | 90 #include "content/common/sandbox_init_mac.h" |
| 90 #endif // !OS_IOS | 91 #endif // !OS_IOS |
| 91 #endif // OS_WIN | 92 #endif // OS_WIN |
| 92 | 93 |
| 93 #if defined(OS_POSIX) | 94 #if defined(OS_POSIX) |
| 94 #include <signal.h> | 95 #include <signal.h> |
| 95 | 96 |
| 96 #include "base/posix/global_descriptors.h" | 97 #include "base/posix/global_descriptors.h" |
| 97 #include "content/public/common/content_descriptors.h" | 98 #include "content/public/common/content_descriptors.h" |
| (...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 545 | 546 |
| 546 // Don't create this loop on iOS, since the outer loop is already handled | 547 // Don't create this loop on iOS, since the outer loop is already handled |
| 547 // and a loop that's destroyed in shutdown interleaves badly with the event | 548 // and a loop that's destroyed in shutdown interleaves badly with the event |
| 548 // loop pool on iOS. | 549 // loop pool on iOS. |
| 549 #if defined(OS_MACOSX) && !defined(OS_IOS) | 550 #if defined(OS_MACOSX) && !defined(OS_IOS) |
| 550 // We need this pool for all the objects created before we get to the | 551 // We need this pool for all the objects created before we get to the |
| 551 // event loop, but we don't want to leave them hanging around until the | 552 // event loop, but we don't want to leave them hanging around until the |
| 552 // app quits. Each "main" needs to flush this pool right before it goes into | 553 // app quits. Each "main" needs to flush this pool right before it goes into |
| 553 // its main event loop to get rid of the cruft. | 554 // its main event loop to get rid of the cruft. |
| 554 autorelease_pool_.reset(new base::mac::ScopedNSAutoreleasePool()); | 555 autorelease_pool_.reset(new base::mac::ScopedNSAutoreleasePool()); |
| 556 InitializeMac(); |
| 555 #endif | 557 #endif |
| 556 | 558 |
| 557 // On Android, the command line is initialized when library is loaded and | 559 // On Android, the command line is initialized when library is loaded and |
| 558 // we have already started our TRACE_EVENT0. | 560 // we have already started our TRACE_EVENT0. |
| 559 #if !defined(OS_ANDROID) | 561 #if !defined(OS_ANDROID) |
| 560 // argc/argv are ignored on Windows and Android; see command_line.h for | 562 // argc/argv are ignored on Windows and Android; see command_line.h for |
| 561 // details. | 563 // details. |
| 562 int argc = 0; | 564 int argc = 0; |
| 563 const char** argv = NULL; | 565 const char** argv = NULL; |
| 564 | 566 |
| (...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 845 | 847 |
| 846 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); | 848 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); |
| 847 }; | 849 }; |
| 848 | 850 |
| 849 // static | 851 // static |
| 850 ContentMainRunner* ContentMainRunner::Create() { | 852 ContentMainRunner* ContentMainRunner::Create() { |
| 851 return new ContentMainRunnerImpl(); | 853 return new ContentMainRunnerImpl(); |
| 852 } | 854 } |
| 853 | 855 |
| 854 } // namespace content | 856 } // namespace content |
| OLD | NEW |