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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 #include <shellapi.h> | 82 #include <shellapi.h> |
83 | 83 |
84 #include "app/win_util.h" | 84 #include "app/win_util.h" |
85 #include "base/registry.h" | 85 #include "base/registry.h" |
86 #include "base/win_util.h" | 86 #include "base/win_util.h" |
87 #include "chrome/browser/browser.h" | 87 #include "chrome/browser/browser.h" |
88 #include "chrome/browser/browser_trial.h" | 88 #include "chrome/browser/browser_trial.h" |
89 #include "chrome/browser/jankometer.h" | 89 #include "chrome/browser/jankometer.h" |
90 #include "chrome/browser/metrics/user_metrics.h" | 90 #include "chrome/browser/metrics/user_metrics.h" |
91 #include "chrome/browser/net/url_fixer_upper.h" | 91 #include "chrome/browser/net/url_fixer_upper.h" |
92 #include "chrome/browser/printing/print_job_manager.h" | 92 #include "chrome/browser/printing/printed_document.h" |
93 #include "chrome/browser/profile.h" | 93 #include "chrome/browser/profile.h" |
94 #include "chrome/browser/rlz/rlz.h" | 94 #include "chrome/browser/rlz/rlz.h" |
95 #include "chrome/browser/views/user_data_dir_dialog.h" | 95 #include "chrome/browser/views/user_data_dir_dialog.h" |
96 #include "chrome/common/env_vars.h" | 96 #include "chrome/common/env_vars.h" |
97 #include "chrome/installer/util/helper.h" | 97 #include "chrome/installer/util/helper.h" |
98 #include "chrome/installer/util/install_util.h" | 98 #include "chrome/installer/util/install_util.h" |
99 #include "chrome/installer/util/shell_util.h" | 99 #include "chrome/installer/util/shell_util.h" |
100 #include "chrome/installer/util/version.h" | 100 #include "chrome/installer/util/version.h" |
101 #include "net/base/net_util.h" | 101 #include "net/base/net_util.h" |
102 #include "net/base/sdch_manager.h" | 102 #include "net/base/sdch_manager.h" |
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
750 } else { | 750 } else { |
751 // If the user permits metrics reporting with the checkbox in the | 751 // If the user permits metrics reporting with the checkbox in the |
752 // prefs, we turn on recording. | 752 // prefs, we turn on recording. |
753 metrics->SetUserPermitsUpload(enabled); | 753 metrics->SetUserPermitsUpload(enabled); |
754 if (enabled) | 754 if (enabled) |
755 metrics->Start(); | 755 metrics->Start(); |
756 } | 756 } |
757 } | 757 } |
758 InstallJankometer(parsed_command_line); | 758 InstallJankometer(parsed_command_line); |
759 | 759 |
760 #if defined(OS_WIN) | 760 #if defined(OS_WIN) && !defined(GOOGLE_CHROME_BUILD) |
761 if (parsed_command_line.HasSwitch(switches::kDebugPrint)) { | 761 if (parsed_command_line.HasSwitch(switches::kDebugPrint)) { |
762 browser_process->print_job_manager()->set_debug_dump_path( | 762 printing::PrintedDocument::set_debug_dump_path( |
763 parsed_command_line.GetSwitchValue(switches::kDebugPrint)); | 763 parsed_command_line.GetSwitchValue(switches::kDebugPrint)); |
764 } | 764 } |
765 #endif | 765 #endif |
766 | 766 |
767 HandleErrorTestParameters(parsed_command_line); | 767 HandleErrorTestParameters(parsed_command_line); |
768 RecordBreakpadStatusUMA(metrics); | 768 RecordBreakpadStatusUMA(metrics); |
769 // Start up the extensions service. This should happen before Start(). | 769 // Start up the extensions service. This should happen before Start(). |
770 profile->InitExtensions(); | 770 profile->InitExtensions(); |
771 // Start up the web resource service. This starts loading data after a | 771 // Start up the web resource service. This starts loading data after a |
772 // short delay so as not to interfere with startup time. | 772 // short delay so as not to interfere with startup time. |
(...skipping 25 matching lines...) Expand all Loading... |
798 if (metrics) | 798 if (metrics) |
799 metrics->Stop(); | 799 metrics->Stop(); |
800 | 800 |
801 // browser_shutdown takes care of deleting browser_process, so we need to | 801 // browser_shutdown takes care of deleting browser_process, so we need to |
802 // release it. | 802 // release it. |
803 browser_process.release(); | 803 browser_process.release(); |
804 browser_shutdown::Shutdown(); | 804 browser_shutdown::Shutdown(); |
805 | 805 |
806 return result_code; | 806 return result_code; |
807 } | 807 } |
OLD | NEW |