OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/browser/browser_main.h" | 5 #include "chrome/browser/browser_main.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 #include <commctrl.h> | 117 #include <commctrl.h> |
118 #include <shellapi.h> | 118 #include <shellapi.h> |
119 | 119 |
120 #include "app/l10n_util_win.h" | 120 #include "app/l10n_util_win.h" |
121 #include "app/win_util.h" | 121 #include "app/win_util.h" |
122 #include "chrome/browser/browser_trial.h" | 122 #include "chrome/browser/browser_trial.h" |
123 #include "chrome/browser/metrics/user_metrics.h" | 123 #include "chrome/browser/metrics/user_metrics.h" |
124 #include "chrome/browser/net/url_fixer_upper.h" | 124 #include "chrome/browser/net/url_fixer_upper.h" |
125 #include "chrome/browser/rlz/rlz.h" | 125 #include "chrome/browser/rlz/rlz.h" |
126 #include "chrome/browser/views/user_data_dir_dialog.h" | 126 #include "chrome/browser/views/user_data_dir_dialog.h" |
127 #include "chrome/common/env_vars.h" | |
128 #include "chrome/common/sandbox_policy.h" | 127 #include "chrome/common/sandbox_policy.h" |
129 #include "chrome/installer/util/helper.h" | 128 #include "chrome/installer/util/helper.h" |
130 #include "chrome/installer/util/install_util.h" | 129 #include "chrome/installer/util/install_util.h" |
131 #include "chrome/installer/util/shell_util.h" | 130 #include "chrome/installer/util/shell_util.h" |
132 #include "chrome/installer/util/version.h" | 131 #include "chrome/installer/util/version.h" |
133 #include "gfx/platform_font_win.h" | 132 #include "gfx/platform_font_win.h" |
134 #include "net/base/net_util.h" | 133 #include "net/base/net_util.h" |
135 #include "net/base/sdch_manager.h" | 134 #include "net/base/sdch_manager.h" |
136 #include "printing/printed_document.h" | 135 #include "printing/printed_document.h" |
137 #include "sandbox/src/sandbox.h" | 136 #include "sandbox/src/sandbox.h" |
(...skipping 1370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1508 metrics->Stop(); | 1507 metrics->Stop(); |
1509 | 1508 |
1510 // browser_shutdown takes care of deleting browser_process, so we need to | 1509 // browser_shutdown takes care of deleting browser_process, so we need to |
1511 // release it. | 1510 // release it. |
1512 ignore_result(browser_process.release()); | 1511 ignore_result(browser_process.release()); |
1513 browser_shutdown::Shutdown(); | 1512 browser_shutdown::Shutdown(); |
1514 | 1513 |
1515 TRACE_EVENT_END("BrowserMain", 0, 0); | 1514 TRACE_EVENT_END("BrowserMain", 0, 0); |
1516 return result_code; | 1515 return result_code; |
1517 } | 1516 } |
OLD | NEW |