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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 #include "chrome/browser/first_run/first_run.h" | 54 #include "chrome/browser/first_run/first_run.h" |
55 #include "chrome/browser/first_run/upgrade_util.h" | 55 #include "chrome/browser/first_run/upgrade_util.h" |
56 #include "chrome/browser/google/google_search_counter.h" | 56 #include "chrome/browser/google/google_search_counter.h" |
57 #include "chrome/browser/gpu/gl_string_manager.h" | 57 #include "chrome/browser/gpu/gl_string_manager.h" |
58 #include "chrome/browser/gpu/three_d_api_observer.h" | 58 #include "chrome/browser/gpu/three_d_api_observer.h" |
59 #include "chrome/browser/jankometer.h" | 59 #include "chrome/browser/jankometer.h" |
60 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 60 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
61 #include "chrome/browser/metrics/field_trial_synchronizer.h" | 61 #include "chrome/browser/metrics/field_trial_synchronizer.h" |
62 #include "chrome/browser/metrics/thread_watcher.h" | 62 #include "chrome/browser/metrics/thread_watcher.h" |
63 #include "chrome/browser/metrics/tracking_synchronizer.h" | 63 #include "chrome/browser/metrics/tracking_synchronizer.h" |
64 #include "chrome/browser/metrics/variations/variations_http_header_provider.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" |
71 #include "chrome/browser/performance_monitor/performance_monitor.h" | 70 #include "chrome/browser/performance_monitor/performance_monitor.h" |
72 #include "chrome/browser/performance_monitor/startup_timer.h" | 71 #include "chrome/browser/performance_monitor/startup_timer.h" |
73 #include "chrome/browser/plugins/plugin_prefs.h" | 72 #include "chrome/browser/plugins/plugin_prefs.h" |
74 #include "chrome/browser/pref_service_flags_storage.h" | 73 #include "chrome/browser/pref_service_flags_storage.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 #include "components/google/core/browser/google_util.h" | 105 #include "components/google/core/browser/google_util.h" |
107 #include "components/language_usage_metrics/language_usage_metrics.h" | 106 #include "components/language_usage_metrics/language_usage_metrics.h" |
108 #include "components/metrics/metrics_pref_names.h" | 107 #include "components/metrics/metrics_pref_names.h" |
109 #include "components/metrics/metrics_service.h" | 108 #include "components/metrics/metrics_service.h" |
110 #include "components/nacl/browser/nacl_browser.h" | 109 #include "components/nacl/browser/nacl_browser.h" |
111 #include "components/nacl/browser/nacl_process_host.h" | 110 #include "components/nacl/browser/nacl_process_host.h" |
112 #include "components/rappor/rappor_service.h" | 111 #include "components/rappor/rappor_service.h" |
113 #include "components/signin/core/common/profile_management_switches.h" | 112 #include "components/signin/core/common/profile_management_switches.h" |
114 #include "components/startup_metric_utils/startup_metric_utils.h" | 113 #include "components/startup_metric_utils/startup_metric_utils.h" |
115 #include "components/translate/core/browser/translate_download_manager.h" | 114 #include "components/translate/core/browser/translate_download_manager.h" |
| 115 #include "components/variations/variations_http_header_provider.h" |
116 #include "content/public/browser/browser_thread.h" | 116 #include "content/public/browser/browser_thread.h" |
117 #include "content/public/browser/notification_observer.h" | 117 #include "content/public/browser/notification_observer.h" |
118 #include "content/public/browser/notification_registrar.h" | 118 #include "content/public/browser/notification_registrar.h" |
119 #include "content/public/browser/notification_service.h" | 119 #include "content/public/browser/notification_service.h" |
120 #include "content/public/browser/notification_types.h" | 120 #include "content/public/browser/notification_types.h" |
121 #include "content/public/browser/site_instance.h" | 121 #include "content/public/browser/site_instance.h" |
122 #include "content/public/common/content_client.h" | 122 #include "content/public/common/content_client.h" |
123 #include "content/public/common/content_switches.h" | 123 #include "content/public/common/content_switches.h" |
124 #include "content/public/common/main_function_params.h" | 124 #include "content/public/common/main_function_params.h" |
125 #include "extensions/browser/extension_protocols.h" | 125 #include "extensions/browser/extension_protocols.h" |
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
582 bool result = base::FieldTrialList::CreateTrialsFromString( | 582 bool result = base::FieldTrialList::CreateTrialsFromString( |
583 command_line->GetSwitchValueASCII(switches::kForceFieldTrials), | 583 command_line->GetSwitchValueASCII(switches::kForceFieldTrials), |
584 base::FieldTrialList::DONT_ACTIVATE_TRIALS, | 584 base::FieldTrialList::DONT_ACTIVATE_TRIALS, |
585 unforceable_field_trials); | 585 unforceable_field_trials); |
586 CHECK(result) << "Invalid --" << switches::kForceFieldTrials | 586 CHECK(result) << "Invalid --" << switches::kForceFieldTrials |
587 << " list specified."; | 587 << " list specified."; |
588 } | 588 } |
589 if (command_line->HasSwitch(switches::kForceVariationIds)) { | 589 if (command_line->HasSwitch(switches::kForceVariationIds)) { |
590 // Create default variation ids which will always be included in the | 590 // Create default variation ids which will always be included in the |
591 // X-Client-Data request header. | 591 // X-Client-Data request header. |
592 chrome_variations::VariationsHttpHeaderProvider* provider = | 592 variations::VariationsHttpHeaderProvider* provider = |
593 chrome_variations::VariationsHttpHeaderProvider::GetInstance(); | 593 variations::VariationsHttpHeaderProvider::GetInstance(); |
594 bool result = provider->SetDefaultVariationIds( | 594 bool result = provider->SetDefaultVariationIds( |
595 command_line->GetSwitchValueASCII(switches::kForceVariationIds)); | 595 command_line->GetSwitchValueASCII(switches::kForceVariationIds)); |
596 CHECK(result) << "Invalid --" << switches::kForceVariationIds | 596 CHECK(result) << "Invalid --" << switches::kForceVariationIds |
597 << " list specified."; | 597 << " list specified."; |
598 } | 598 } |
599 chrome_variations::VariationsService* variations_service = | 599 chrome_variations::VariationsService* variations_service = |
600 browser_process_->variations_service(); | 600 browser_process_->variations_service(); |
601 if (variations_service) | 601 if (variations_service) |
602 variations_service->CreateTrialsFromSeed(); | 602 variations_service->CreateTrialsFromSeed(); |
603 | 603 |
(...skipping 1055 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1659 chromeos::CrosSettings::Shutdown(); | 1659 chromeos::CrosSettings::Shutdown(); |
1660 #endif | 1660 #endif |
1661 #endif | 1661 #endif |
1662 } | 1662 } |
1663 | 1663 |
1664 // Public members: | 1664 // Public members: |
1665 | 1665 |
1666 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1666 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1667 chrome_extra_parts_.push_back(parts); | 1667 chrome_extra_parts_.push_back(parts); |
1668 } | 1668 } |
OLD | NEW |