Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(638)

Side by Side Diff: chrome/browser/browser_main.cc

Issue 7564006: Rename PluginUpdater to PluginPrefs and make it per-profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser_main.h" 5 #include "chrome/browser/browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
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
50 #include "chrome/browser/metrics/field_trial_synchronizer.h" 50 #include "chrome/browser/metrics/field_trial_synchronizer.h"
51 #include "chrome/browser/metrics/histogram_synchronizer.h" 51 #include "chrome/browser/metrics/histogram_synchronizer.h"
52 #include "chrome/browser/metrics/metrics_log.h" 52 #include "chrome/browser/metrics/metrics_log.h"
53 #include "chrome/browser/metrics/metrics_service.h" 53 #include "chrome/browser/metrics/metrics_service.h"
54 #include "chrome/browser/metrics/thread_watcher.h" 54 #include "chrome/browser/metrics/thread_watcher.h"
55 #include "chrome/browser/net/chrome_dns_cert_provenance_checker.h" 55 #include "chrome/browser/net/chrome_dns_cert_provenance_checker.h"
56 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h" 56 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h"
57 #include "chrome/browser/net/chrome_net_log.h" 57 #include "chrome/browser/net/chrome_net_log.h"
58 #include "chrome/browser/net/predictor_api.h" 58 #include "chrome/browser/net/predictor_api.h"
59 #include "chrome/browser/net/sdch_dictionary_fetcher.h" 59 #include "chrome/browser/net/sdch_dictionary_fetcher.h"
60 #include "chrome/browser/plugin_updater.h" 60 #include "chrome/browser/plugin_prefs.h"
61 #include "chrome/browser/policy/browser_policy_connector.h" 61 #include "chrome/browser/policy/browser_policy_connector.h"
62 #include "chrome/browser/prefs/pref_service.h" 62 #include "chrome/browser/prefs/pref_service.h"
63 #include "chrome/browser/prefs/pref_value_store.h" 63 #include "chrome/browser/prefs/pref_value_store.h"
64 #include "chrome/browser/prerender/prerender_field_trial.h" 64 #include "chrome/browser/prerender/prerender_field_trial.h"
65 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" 65 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
66 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h" 66 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h"
67 #include "chrome/browser/process_singleton.h" 67 #include "chrome/browser/process_singleton.h"
68 #include "chrome/browser/profiles/profile.h" 68 #include "chrome/browser/profiles/profile.h"
69 #include "chrome/browser/profiles/profile_manager.h" 69 #include "chrome/browser/profiles/profile_manager.h"
70 #include "chrome/browser/search_engines/search_engine_type.h" 70 #include "chrome/browser/search_engines/search_engine_type.h"
(...skipping 1785 matching lines...) Expand 10 before | Expand all | Expand 10 after
1856 // 1856 //
1857 // A simpler way of doing all this would be to have some function which could 1857 // A simpler way of doing all this would be to have some function which could
1858 // give the time elapsed since startup, and simply have these objects check 1858 // give the time elapsed since startup, and simply have these objects check
1859 // that when asked to initialize themselves, but this doesn't seem to exist. 1859 // that when asked to initialize themselves, but this doesn't seem to exist.
1860 // 1860 //
1861 // These can't be created in the BrowserProcessImpl constructor because they 1861 // These can't be created in the BrowserProcessImpl constructor because they
1862 // need to read prefs that get set after that runs. 1862 // need to read prefs that get set after that runs.
1863 browser_process->google_url_tracker(); 1863 browser_process->google_url_tracker();
1864 browser_process->intranet_redirect_detector(); 1864 browser_process->intranet_redirect_detector();
1865 1865
1866 // Do initialize the plug-in service (and related preferences).
1867 PluginUpdater::GetInstance()->SetProfile(profile);
1868
1869 // Prepare for memory caching of SDCH dictionaries. 1866 // Prepare for memory caching of SDCH dictionaries.
1870 // Perform A/B test to measure global impact of SDCH support. 1867 // Perform A/B test to measure global impact of SDCH support.
1871 // Set up a field trial to see what disabling SDCH does to latency of page 1868 // Set up a field trial to see what disabling SDCH does to latency of page
1872 // layout globally. 1869 // layout globally.
1873 base::FieldTrial::Probability kSDCH_DIVISOR = 1000; 1870 base::FieldTrial::Probability kSDCH_DIVISOR = 1000;
1874 base::FieldTrial::Probability kSDCH_DISABLE_PROBABILITY = 1; // 0.1% prob. 1871 base::FieldTrial::Probability kSDCH_DISABLE_PROBABILITY = 1; // 0.1% prob.
1875 // After June 30, 2011 builds, it will always be in default group. 1872 // After June 30, 2011 builds, it will always be in default group.
1876 scoped_refptr<base::FieldTrial> sdch_trial( 1873 scoped_refptr<base::FieldTrial> sdch_trial(
1877 new base::FieldTrial("GlobalSdch", kSDCH_DIVISOR, "global_enable_sdch", 1874 new base::FieldTrial("GlobalSdch", kSDCH_DIVISOR, "global_enable_sdch",
1878 2011, 6, 30)); 1875 2011, 6, 30));
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
2115 #if defined(OS_CHROMEOS) 2112 #if defined(OS_CHROMEOS)
2116 // To be precise, logout (browser shutdown) is not yet done, but the 2113 // To be precise, logout (browser shutdown) is not yet done, but the
2117 // remaining work is negligible, hence we say LogoutDone here. 2114 // remaining work is negligible, hence we say LogoutDone here.
2118 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 2115 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
2119 false); 2116 false);
2120 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 2117 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
2121 #endif 2118 #endif
2122 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); 2119 TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
2123 return result_code; 2120 return result_code;
2124 } 2121 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698