OLD | NEW |
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 #include <shellapi.h> | 83 #include <shellapi.h> |
84 | 84 |
85 #include "app/win_util.h" | 85 #include "app/win_util.h" |
86 #include "base/registry.h" | 86 #include "base/registry.h" |
87 #include "base/win_util.h" | 87 #include "base/win_util.h" |
88 #include "chrome/browser/browser.h" | 88 #include "chrome/browser/browser.h" |
89 #include "chrome/browser/browser_trial.h" | 89 #include "chrome/browser/browser_trial.h" |
90 #include "chrome/browser/jankometer.h" | 90 #include "chrome/browser/jankometer.h" |
91 #include "chrome/browser/metrics/user_metrics.h" | 91 #include "chrome/browser/metrics/user_metrics.h" |
92 #include "chrome/browser/net/url_fixer_upper.h" | 92 #include "chrome/browser/net/url_fixer_upper.h" |
93 #include "chrome/browser/printing/printed_document.h" | |
94 #include "chrome/browser/profile.h" | 93 #include "chrome/browser/profile.h" |
95 #include "chrome/browser/rlz/rlz.h" | 94 #include "chrome/browser/rlz/rlz.h" |
96 #include "chrome/browser/views/user_data_dir_dialog.h" | 95 #include "chrome/browser/views/user_data_dir_dialog.h" |
97 #include "chrome/common/env_vars.h" | 96 #include "chrome/common/env_vars.h" |
98 #include "chrome/installer/util/helper.h" | 97 #include "chrome/installer/util/helper.h" |
99 #include "chrome/installer/util/install_util.h" | 98 #include "chrome/installer/util/install_util.h" |
100 #include "chrome/installer/util/shell_util.h" | 99 #include "chrome/installer/util/shell_util.h" |
101 #include "chrome/installer/util/version.h" | 100 #include "chrome/installer/util/version.h" |
102 #include "net/base/net_util.h" | 101 #include "net/base/net_util.h" |
103 #include "net/base/sdch_manager.h" | 102 #include "net/base/sdch_manager.h" |
104 #include "net/base/winsock_init.h" | 103 #include "net/base/winsock_init.h" |
105 #include "net/http/http_network_layer.h" | 104 #include "net/http/http_network_layer.h" |
| 105 #include "printing/printed_document.h" |
106 #include "sandbox/src/sandbox.h" | 106 #include "sandbox/src/sandbox.h" |
107 #include "views/widget/accelerator_handler.h" | 107 #include "views/widget/accelerator_handler.h" |
108 #endif // defined(OS_WIN) | 108 #endif // defined(OS_WIN) |
109 | 109 |
110 #if defined(TOOLKIT_GTK) | 110 #if defined(TOOLKIT_GTK) |
111 #include "chrome/common/gtk_util.h" | 111 #include "chrome/common/gtk_util.h" |
112 #elif defined(TOOLKIT_VIEWS) | 112 #elif defined(TOOLKIT_VIEWS) |
113 #include "chrome/browser/views/chrome_views_delegate.h" | 113 #include "chrome/browser/views/chrome_views_delegate.h" |
114 #endif | 114 #endif |
115 | 115 |
(...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
801 if (metrics) | 801 if (metrics) |
802 metrics->Stop(); | 802 metrics->Stop(); |
803 | 803 |
804 // browser_shutdown takes care of deleting browser_process, so we need to | 804 // browser_shutdown takes care of deleting browser_process, so we need to |
805 // release it. | 805 // release it. |
806 browser_process.release(); | 806 browser_process.release(); |
807 browser_shutdown::Shutdown(); | 807 browser_shutdown::Shutdown(); |
808 | 808 |
809 return result_code; | 809 return result_code; |
810 } | 810 } |
OLD | NEW |