chrome/browser/plugin_updater.h - Issue 5699005: Policy: Re-enabled plugin still disabled

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/plugin_updater.h

Issue 5699005: Policy: Re-enabled plugin still disabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Forgotten to upload the mergeconflict resolutions (trybots happiness aplies to this upload). Created 9 years, 11 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:

Index: chrome/browser/plugin_updater.h

diff --git a/chrome/browser/plugin_updater.h b/chrome/browser/plugin_updater.h

index dc185954c2c7bdf0aee61fe94c2ab49dc88171ac..2c4fed769ba923be918b8a82affad52db64327c6 100644

--- a/chrome/browser/plugin_updater.h

+++ b/chrome/browser/plugin_updater.h

@@ -36,7 +36,7 @@ class PluginUpdater : public NotificationObserver {

void EnablePluginGroup(bool enable, const string16& group_name);

// Enable or disable a specific plugin file.

- void EnablePluginFile(bool enable, const FilePath::StringType& file_path);

+ void EnablePlugin(bool enable, const FilePath::StringType& file_path);

// Disable all plugin groups as defined by the user's preference file.

void DisablePluginGroupsFromPrefs(Profile* profile);