chrome/browser/prefs/browser_prefs.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/prefs/browser_prefs.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/prefs/browser_prefs.cc

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

--- chrome/browser/prefs/browser_prefs.cc (revision 96410)

+++ chrome/browser/prefs/browser_prefs.cc (working copy)

@@ -36,7 +36,7 @@

#include "chrome/browser/notifications/notification_ui_manager.h"

#include "chrome/browser/page_info_model.h"

#include "chrome/browser/password_manager/password_manager.h"

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

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

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

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

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

@@ -156,8 +156,8 @@

ExtensionsUI::RegisterUserPrefs(user_prefs);

IncognitoModePrefs::RegisterUserPrefs(user_prefs);

NewTabUI::RegisterUserPrefs(user_prefs);

+ PluginPrefs::RegisterPrefs(user_prefs);

PluginsUI::RegisterUserPrefs(user_prefs);

- PluginUpdater::RegisterPrefs(user_prefs);

ProfileImpl::RegisterUserPrefs(user_prefs);

PromoResourceService::RegisterUserPrefs(user_prefs);

HostContentSettingsMap::RegisterUserPrefs(user_prefs);

« no previous file with comments | « chrome/browser/plugin_updater.cc ('k') | chrome/browser/profiles/profile_dependency_manager.cc » ('j') | no next file with comments »