| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 // TODO(port): several win-only methods have been pulled out of this, but | 201 // TODO(port): several win-only methods have been pulled out of this, but |
| 202 // BrowserMain() as a whole needs to be broken apart so that it's usable by | 202 // BrowserMain() as a whole needs to be broken apart so that it's usable by |
| 203 // other platforms. For now, it's just a stub. This is a serious work in | 203 // other platforms. For now, it's just a stub. This is a serious work in |
| 204 // progress and should not be taken as an indication of a real refactoring. | 204 // progress and should not be taken as an indication of a real refactoring. |
| 205 | 205 |
| 206 #if defined(OS_WIN) | 206 #if defined(OS_WIN) |
| 207 #include "base/trace_event/trace_event_etw_export_win.h" | 207 #include "base/trace_event/trace_event_etw_export_win.h" |
| 208 #include "base/win/windows_version.h" | 208 #include "base/win/windows_version.h" |
| 209 #include "chrome/app/file_pre_reader_win.h" | 209 #include "chrome/app/file_pre_reader_win.h" |
| 210 #include "chrome/browser/chrome_browser_main_win.h" | 210 #include "chrome/browser/chrome_browser_main_win.h" |
| 211 #include "chrome/browser/component_updater/caps_installer_win.h" | |
| 212 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" | 211 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" |
| 213 #include "chrome/browser/downgrade/user_data_downgrade.h" | 212 #include "chrome/browser/downgrade/user_data_downgrade.h" |
| 214 #include "chrome/browser/first_run/try_chrome_dialog_view.h" | 213 #include "chrome/browser/first_run/try_chrome_dialog_view.h" |
| 215 #include "chrome/browser/first_run/upgrade_util_win.h" | 214 #include "chrome/browser/first_run/upgrade_util_win.h" |
| 216 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" | 215 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" |
| 217 #include "chrome/browser/ui/network_profile_bubble.h" | 216 #include "chrome/browser/ui/network_profile_bubble.h" |
| 218 #include "chrome/browser/win/browser_util.h" | 217 #include "chrome/browser/win/browser_util.h" |
| 219 #include "chrome/browser/win/chrome_select_file_dialog_factory.h" | 218 #include "chrome/browser/win/chrome_select_file_dialog_factory.h" |
| 220 #include "chrome/installer/util/browser_distribution.h" | 219 #include "chrome/installer/util/browser_distribution.h" |
| 221 #include "chrome/installer/util/helper.h" | 220 #include "chrome/installer/util/helper.h" |
| (...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 658 #endif // defined(OS_ANDROID) | 657 #endif // defined(OS_ANDROID) |
| 659 RegisterOriginTrialsComponent(cus, path); | 658 RegisterOriginTrialsComponent(cus, path); |
| 660 | 659 |
| 661 RegisterFileTypePoliciesComponent(cus, path); | 660 RegisterFileTypePoliciesComponent(cus, path); |
| 662 } | 661 } |
| 663 | 662 |
| 664 #if defined(OS_WIN) | 663 #if defined(OS_WIN) |
| 665 #if defined(GOOGLE_CHROME_BUILD) | 664 #if defined(GOOGLE_CHROME_BUILD) |
| 666 RegisterSwReporterComponent(cus); | 665 RegisterSwReporterComponent(cus); |
| 667 #endif // defined(GOOGLE_CHROME_BUILD) | 666 #endif // defined(GOOGLE_CHROME_BUILD) |
| 668 RegisterCAPSComponent(cus); | |
| 669 #endif // defined(OS_WIN) | 667 #endif // defined(OS_WIN) |
| 670 } | 668 } |
| 671 | 669 |
| 672 #if !defined(OS_ANDROID) | 670 #if !defined(OS_ANDROID) |
| 673 bool ProcessSingletonNotificationCallback( | 671 bool ProcessSingletonNotificationCallback( |
| 674 const base::CommandLine& command_line, | 672 const base::CommandLine& command_line, |
| 675 const base::FilePath& current_directory) { | 673 const base::FilePath& current_directory) { |
| 676 // Drop the request if the browser process is already in shutdown path. | 674 // Drop the request if the browser process is already in shutdown path. |
| 677 if (!g_browser_process || g_browser_process->IsShuttingDown()) | 675 if (!g_browser_process || g_browser_process->IsShuttingDown()) |
| 678 return false; | 676 return false; |
| (...skipping 1530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2209 chromeos::CrosSettings::Shutdown(); | 2207 chromeos::CrosSettings::Shutdown(); |
| 2210 #endif // defined(OS_CHROMEOS) | 2208 #endif // defined(OS_CHROMEOS) |
| 2211 #endif // defined(OS_ANDROID) | 2209 #endif // defined(OS_ANDROID) |
| 2212 } | 2210 } |
| 2213 | 2211 |
| 2214 // Public members: | 2212 // Public members: |
| 2215 | 2213 |
| 2216 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2214 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 2217 chrome_extra_parts_.push_back(parts); | 2215 chrome_extra_parts_.push_back(parts); |
| 2218 } | 2216 } |
| OLD | NEW |