chrome/browser/dom_ui/plugins_ui.cc - 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/dom_ui/plugins_ui.cc

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/dom_ui/plugins_ui.cc

diff --git a/chrome/browser/dom_ui/plugins_ui.cc b/chrome/browser/dom_ui/plugins_ui.cc

index 377dc98c9f1e1f27c3213777277c5ebdccbb1ac5..dbcd2f2525550018d98c6eb603a064b3c6f2180b 100644

--- a/chrome/browser/dom_ui/plugins_ui.cc

+++ b/chrome/browser/dom_ui/plugins_ui.cc

@@ -83,8 +83,6 @@ void PluginsUIHTMLSource::StartDataRequest(const std::string& path,

l10n_util::GetStringUTF16(IDS_PLUGINS_DOWNLOAD));

localized_strings.SetString("pluginName",

l10n_util::GetStringUTF16(IDS_PLUGINS_NAME));

- localized_strings.SetString("pluginPriority",

- l10n_util::GetStringUTF16(IDS_PLUGINS_PRIORITY));

localized_strings.SetString("pluginVersion",

l10n_util::GetStringUTF16(IDS_PLUGINS_VERSION));

localized_strings.SetString("pluginDescription",

@@ -237,7 +235,7 @@ void PluginsDOMHandler::HandleEnablePluginMessage(const ListValue* args) {

if (!args->GetString(0, &file_path))

return;

- plugin_updater->EnablePluginFile(enable, file_path);

+ plugin_updater->EnablePlugin(enable, file_path);

}

// TODO(viettrungluu): We might also want to ensure that the plugins