| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "build/build_config.h" | 5 #include "build/build_config.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
| 10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 #include "chrome/browser/extensions/extension_protocols.h" | 77 #include "chrome/browser/extensions/extension_protocols.h" |
| 78 #include "chrome/browser/jankometer.h" | 78 #include "chrome/browser/jankometer.h" |
| 79 #include "chrome/browser/metrics/user_metrics.h" | 79 #include "chrome/browser/metrics/user_metrics.h" |
| 80 #include "chrome/browser/net/sdch_dictionary_fetcher.h" | 80 #include "chrome/browser/net/sdch_dictionary_fetcher.h" |
| 81 #include "chrome/browser/net/url_fixer_upper.h" | 81 #include "chrome/browser/net/url_fixer_upper.h" |
| 82 #include "chrome/browser/printing/print_job_manager.h" | 82 #include "chrome/browser/printing/print_job_manager.h" |
| 83 #include "chrome/browser/profile.h" | 83 #include "chrome/browser/profile.h" |
| 84 #include "chrome/browser/rlz/rlz.h" | 84 #include "chrome/browser/rlz/rlz.h" |
| 85 #include "chrome/browser/views/user_data_dir_dialog.h" | 85 #include "chrome/browser/views/user_data_dir_dialog.h" |
| 86 #include "chrome/common/env_vars.h" | 86 #include "chrome/common/env_vars.h" |
| 87 #include "chrome/installer/util/google_update_settings.h" | |
| 88 #include "chrome/installer/util/helper.h" | 87 #include "chrome/installer/util/helper.h" |
| 89 #include "chrome/installer/util/install_util.h" | 88 #include "chrome/installer/util/install_util.h" |
| 90 #include "chrome/installer/util/shell_util.h" | 89 #include "chrome/installer/util/shell_util.h" |
| 91 #include "chrome/installer/util/version.h" | 90 #include "chrome/installer/util/version.h" |
| 92 #include "net/base/net_util.h" | 91 #include "net/base/net_util.h" |
| 93 #include "net/base/sdch_manager.h" | 92 #include "net/base/sdch_manager.h" |
| 94 #include "net/base/winsock_init.h" | 93 #include "net/base/winsock_init.h" |
| 95 #include "net/http/http_network_layer.h" | 94 #include "net/http/http_network_layer.h" |
| 96 #include "sandbox/src/sandbox.h" | 95 #include "sandbox/src/sandbox.h" |
| 97 #include "views/widget/accelerator_handler.h" | 96 #include "views/widget/accelerator_handler.h" |
| 98 | 97 |
| 99 #endif // defined(OS_WIN) | 98 #endif // defined(OS_WIN) |
| 100 | 99 |
| 100 #if defined(OS_WIN) || defined(OS_MACOSX) |
| 101 #include "chrome/installer/util/google_update_settings.h" |
| 102 #endif // OS_WIN || OS_MACOSX |
| 103 |
| 101 namespace Platform { | 104 namespace Platform { |
| 102 | 105 |
| 103 void WillInitializeMainMessageLoop(const CommandLine & command_line); | 106 void WillInitializeMainMessageLoop(const CommandLine & command_line); |
| 104 void WillTerminate(); | 107 void WillTerminate(); |
| 105 | 108 |
| 106 #if defined(OS_WIN) || defined(OS_LINUX) | 109 #if defined(OS_WIN) || defined(OS_LINUX) |
| 107 // Perform any platform-specific work that needs to be done before the main | 110 // Perform any platform-specific work that needs to be done before the main |
| 108 // message loop is created and initialized. | 111 // message loop is created and initialized. |
| 109 void WillInitializeMainMessageLoop(const CommandLine & command_line) { | 112 void WillInitializeMainMessageLoop(const CommandLine & command_line) { |
| 110 } | 113 } |
| (...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 658 if (metrics) | 661 if (metrics) |
| 659 metrics->Stop(); | 662 metrics->Stop(); |
| 660 | 663 |
| 661 // browser_shutdown takes care of deleting browser_process, so we need to | 664 // browser_shutdown takes care of deleting browser_process, so we need to |
| 662 // release it. | 665 // release it. |
| 663 browser_process.release(); | 666 browser_process.release(); |
| 664 browser_shutdown::Shutdown(); | 667 browser_shutdown::Shutdown(); |
| 665 | 668 |
| 666 return result_code; | 669 return result_code; |
| 667 } | 670 } |
| OLD | NEW |