chrome/browser/browser_main.cc - Issue 7618013: Revert 96409 - Speculatively revert r96364, it's the best bet on the NaCL breakage.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/browser_main.cc

Issue 7618013: Revert 96409 - Speculatively revert r96364, it's the best bet on the NaCL breakage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: 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 side-by-side diff with in-line comments

Download patch

Index: chrome/browser/browser_main.cc

===================================================================

--- chrome/browser/browser_main.cc (revision 96410)

+++ chrome/browser/browser_main.cc (working copy)

@@ -57,7 +57,7 @@

#include "chrome/browser/net/chrome_net_log.h"

#include "chrome/browser/net/predictor_api.h"

#include "chrome/browser/net/sdch_dictionary_fetcher.h"

-#include "chrome/browser/plugin_updater.h"

+#include "chrome/browser/plugin_prefs.h"

#include "chrome/browser/policy/browser_policy_connector.h"

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/prefs/pref_value_store.h"

@@ -1906,9 +1906,6 @@

browser_process->google_url_tracker();

browser_process->intranet_redirect_detector();

- // Do initialize the plug-in service (and related preferences).

- PluginUpdater::GetInstance()->SetProfile(profile);

// Prepare for memory caching of SDCH dictionaries.

// Perform A/B test to measure global impact of SDCH support.

// Set up a field trial to see what disabling SDCH does to latency of page

« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/browser_shutdown.cc » ('j') | no next file with comments »