| 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 <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 #include "chrome/browser/component_updater/swiftshader_component_installer.h" | 50 #include "chrome/browser/component_updater/swiftshader_component_installer.h" |
| 51 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" | 51 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
| 52 #include "chrome/browser/defaults.h" | 52 #include "chrome/browser/defaults.h" |
| 53 #include "chrome/browser/extensions/extension_service.h" | 53 #include "chrome/browser/extensions/extension_service.h" |
| 54 #include "chrome/browser/extensions/startup_helper.h" | 54 #include "chrome/browser/extensions/startup_helper.h" |
| 55 #include "chrome/browser/first_run/first_run.h" | 55 #include "chrome/browser/first_run/first_run.h" |
| 56 #include "chrome/browser/first_run/upgrade_util.h" | 56 #include "chrome/browser/first_run/upgrade_util.h" |
| 57 #include "chrome/browser/google/google_search_counter.h" | 57 #include "chrome/browser/google/google_search_counter.h" |
| 58 #include "chrome/browser/gpu/gl_string_manager.h" | 58 #include "chrome/browser/gpu/gl_string_manager.h" |
| 59 #include "chrome/browser/gpu/three_d_api_observer.h" | 59 #include "chrome/browser/gpu/three_d_api_observer.h" |
| 60 #include "chrome/browser/jankometer.h" | |
| 61 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 60 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
| 62 #include "chrome/browser/metrics/field_trial_synchronizer.h" | 61 #include "chrome/browser/metrics/field_trial_synchronizer.h" |
| 63 #include "chrome/browser/metrics/thread_watcher.h" | 62 #include "chrome/browser/metrics/thread_watcher.h" |
| 64 #include "chrome/browser/metrics/tracking_synchronizer.h" | 63 #include "chrome/browser/metrics/tracking_synchronizer.h" |
| 65 #include "chrome/browser/metrics/variations/variations_service.h" | 64 #include "chrome/browser/metrics/variations/variations_service.h" |
| 66 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" | 65 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" |
| 67 #include "chrome/browser/net/chrome_net_log.h" | 66 #include "chrome/browser/net/chrome_net_log.h" |
| 68 #include "chrome/browser/net/crl_set_fetcher.h" | 67 #include "chrome/browser/net/crl_set_fetcher.h" |
| 69 #include "chrome/browser/notifications/desktop_notification_service.h" | 68 #include "chrome/browser/notifications/desktop_notification_service.h" |
| 70 #include "chrome/browser/notifications/desktop_notification_service_factory.h" | 69 #include "chrome/browser/notifications/desktop_notification_service_factory.h" |
| (...skipping 1298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1369 if (sdch_trial_group.starts_with(kEnabledAllGroupName)) { | 1368 if (sdch_trial_group.starts_with(kEnabledAllGroupName)) { |
| 1370 net::SdchManager::EnableSecureSchemeSupport(true); | 1369 net::SdchManager::EnableSecureSchemeSupport(true); |
| 1371 net::SdchManager::EnableSdchSupport(true); | 1370 net::SdchManager::EnableSdchSupport(true); |
| 1372 } else if (sdch_trial_group.starts_with(kEnabledHttpOnlyGroupName)) { | 1371 } else if (sdch_trial_group.starts_with(kEnabledHttpOnlyGroupName)) { |
| 1373 net::SdchManager::EnableSdchSupport(true); | 1372 net::SdchManager::EnableSdchSupport(true); |
| 1374 } else if (sdch_trial_group.starts_with(kDisabledAllGroupName)) { | 1373 } else if (sdch_trial_group.starts_with(kDisabledAllGroupName)) { |
| 1375 net::SdchManager::EnableSdchSupport(false); | 1374 net::SdchManager::EnableSdchSupport(false); |
| 1376 } | 1375 } |
| 1377 } | 1376 } |
| 1378 | 1377 |
| 1379 if (parsed_command_line().HasSwitch(switches::kEnableWatchdog)) | |
| 1380 InstallJankometer(parsed_command_line()); | |
| 1381 | |
| 1382 #if defined(ENABLE_FULL_PRINTING) && !defined(OFFICIAL_BUILD) | 1378 #if defined(ENABLE_FULL_PRINTING) && !defined(OFFICIAL_BUILD) |
| 1383 if (parsed_command_line().HasSwitch(switches::kDebugPrint)) { | 1379 if (parsed_command_line().HasSwitch(switches::kDebugPrint)) { |
| 1384 base::FilePath path = | 1380 base::FilePath path = |
| 1385 parsed_command_line().GetSwitchValuePath(switches::kDebugPrint); | 1381 parsed_command_line().GetSwitchValuePath(switches::kDebugPrint); |
| 1386 printing::PrintedDocument::set_debug_dump_path(path); | 1382 printing::PrintedDocument::set_debug_dump_path(path); |
| 1387 } | 1383 } |
| 1388 #endif | 1384 #endif |
| 1389 | 1385 |
| 1390 HandleTestParameters(parsed_command_line()); | 1386 HandleTestParameters(parsed_command_line()); |
| 1391 browser_process_->metrics_service()->RecordBreakpadHasDebugger( | 1387 browser_process_->metrics_service()->RecordBreakpadHasDebugger( |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1656 chromeos::CrosSettings::Shutdown(); | 1652 chromeos::CrosSettings::Shutdown(); |
| 1657 #endif | 1653 #endif |
| 1658 #endif | 1654 #endif |
| 1659 } | 1655 } |
| 1660 | 1656 |
| 1661 // Public members: | 1657 // Public members: |
| 1662 | 1658 |
| 1663 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1659 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1664 chrome_extra_parts_.push_back(parts); | 1660 chrome_extra_parts_.push_back(parts); |
| 1665 } | 1661 } |
| OLD | NEW |