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" |
| 11 #include "app/win_util.h" |
11 #include "base/command_line.h" | 12 #include "base/command_line.h" |
12 #include "base/field_trial.h" | 13 #include "base/field_trial.h" |
13 #include "base/file_util.h" | 14 #include "base/file_util.h" |
14 #include "base/histogram.h" | 15 #include "base/histogram.h" |
15 #include "base/lazy_instance.h" | 16 #include "base/lazy_instance.h" |
16 #include "base/scoped_nsautorelease_pool.h" | 17 #include "base/scoped_nsautorelease_pool.h" |
17 #include "base/path_service.h" | 18 #include "base/path_service.h" |
18 #include "base/process_util.h" | 19 #include "base/process_util.h" |
19 #include "base/string_piece.h" | 20 #include "base/string_piece.h" |
20 #include "base/string_util.h" | 21 #include "base/string_util.h" |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 #include "chrome/browser/extensions/extension_protocols.h" | 77 #include "chrome/browser/extensions/extension_protocols.h" |
77 #include "chrome/browser/jankometer.h" | 78 #include "chrome/browser/jankometer.h" |
78 #include "chrome/browser/metrics/user_metrics.h" | 79 #include "chrome/browser/metrics/user_metrics.h" |
79 #include "chrome/browser/net/sdch_dictionary_fetcher.h" | 80 #include "chrome/browser/net/sdch_dictionary_fetcher.h" |
80 #include "chrome/browser/net/url_fixer_upper.h" | 81 #include "chrome/browser/net/url_fixer_upper.h" |
81 #include "chrome/browser/printing/print_job_manager.h" | 82 #include "chrome/browser/printing/print_job_manager.h" |
82 #include "chrome/browser/profile.h" | 83 #include "chrome/browser/profile.h" |
83 #include "chrome/browser/rlz/rlz.h" | 84 #include "chrome/browser/rlz/rlz.h" |
84 #include "chrome/browser/views/user_data_dir_dialog.h" | 85 #include "chrome/browser/views/user_data_dir_dialog.h" |
85 #include "chrome/common/env_vars.h" | 86 #include "chrome/common/env_vars.h" |
86 #include "chrome/common/win_util.h" | |
87 #include "chrome/installer/util/google_update_settings.h" | 87 #include "chrome/installer/util/google_update_settings.h" |
88 #include "chrome/installer/util/helper.h" | 88 #include "chrome/installer/util/helper.h" |
89 #include "chrome/installer/util/install_util.h" | 89 #include "chrome/installer/util/install_util.h" |
90 #include "chrome/installer/util/shell_util.h" | 90 #include "chrome/installer/util/shell_util.h" |
91 #include "chrome/installer/util/version.h" | 91 #include "chrome/installer/util/version.h" |
92 #include "net/base/net_util.h" | 92 #include "net/base/net_util.h" |
93 #include "net/base/sdch_manager.h" | 93 #include "net/base/sdch_manager.h" |
94 #include "net/base/winsock_init.h" | 94 #include "net/base/winsock_init.h" |
95 #include "net/http/http_network_layer.h" | 95 #include "net/http/http_network_layer.h" |
96 #include "sandbox/src/sandbox.h" | 96 #include "sandbox/src/sandbox.h" |
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
634 if (metrics) | 634 if (metrics) |
635 metrics->Stop(); | 635 metrics->Stop(); |
636 | 636 |
637 // browser_shutdown takes care of deleting browser_process, so we need to | 637 // browser_shutdown takes care of deleting browser_process, so we need to |
638 // release it. | 638 // release it. |
639 browser_process.release(); | 639 browser_process.release(); |
640 browser_shutdown::Shutdown(); | 640 browser_shutdown::Shutdown(); |
641 | 641 |
642 return result_code; | 642 return result_code; |
643 } | 643 } |
OLD | NEW |