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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 // other platforms. For now, it's just a stub. This is a serious work in | 100 // other platforms. For now, it's just a stub. This is a serious work in |
101 // progress and should not be taken as an indication of a real refactoring. | 101 // progress and should not be taken as an indication of a real refactoring. |
102 | 102 |
103 #if defined(OS_WIN) | 103 #if defined(OS_WIN) |
104 #include <windows.h> | 104 #include <windows.h> |
105 #include <commctrl.h> | 105 #include <commctrl.h> |
106 #include <shellapi.h> | 106 #include <shellapi.h> |
107 | 107 |
108 #include "app/l10n_util_win.h" | 108 #include "app/l10n_util_win.h" |
109 #include "app/win_util.h" | 109 #include "app/win_util.h" |
110 #include "base/registry.h" | |
111 #include "base/win_util.h" | |
112 #include "chrome/browser/browser_trial.h" | 110 #include "chrome/browser/browser_trial.h" |
113 #include "chrome/browser/metrics/user_metrics.h" | 111 #include "chrome/browser/metrics/user_metrics.h" |
114 #include "chrome/browser/net/url_fixer_upper.h" | 112 #include "chrome/browser/net/url_fixer_upper.h" |
115 #include "chrome/browser/rlz/rlz.h" | 113 #include "chrome/browser/rlz/rlz.h" |
116 #include "chrome/browser/views/user_data_dir_dialog.h" | 114 #include "chrome/browser/views/user_data_dir_dialog.h" |
117 #include "chrome/common/env_vars.h" | 115 #include "chrome/common/env_vars.h" |
118 #include "chrome/common/sandbox_policy.h" | 116 #include "chrome/common/sandbox_policy.h" |
119 #include "chrome/installer/util/helper.h" | 117 #include "chrome/installer/util/helper.h" |
120 #include "chrome/installer/util/install_util.h" | 118 #include "chrome/installer/util/install_util.h" |
121 #include "chrome/installer/util/shell_util.h" | 119 #include "chrome/installer/util/shell_util.h" |
(...skipping 1191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1313 | 1311 |
1314 metrics->Stop(); | 1312 metrics->Stop(); |
1315 | 1313 |
1316 // browser_shutdown takes care of deleting browser_process, so we need to | 1314 // browser_shutdown takes care of deleting browser_process, so we need to |
1317 // release it. | 1315 // release it. |
1318 ignore_result(browser_process.release()); | 1316 ignore_result(browser_process.release()); |
1319 browser_shutdown::Shutdown(); | 1317 browser_shutdown::Shutdown(); |
1320 | 1318 |
1321 return result_code; | 1319 return result_code; |
1322 } | 1320 } |
OLD | NEW |