chrome/browser/ui/webui/plugins_ui.cc - Issue 6869051: Move PepperPluginRegistry to content, while leaving the Chrome specific bits (NaCl, registration ...

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

Issue 6869051: Move PepperPluginRegistry to content, while leaving the Chrome specific bits (NaCl, registration ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 8 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/ui/webui/plugins_ui.cc

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

--- chrome/browser/ui/webui/plugins_ui.cc (revision 81952)

+++ chrome/browser/ui/webui/plugins_ui.cc (working copy)

@@ -20,9 +20,9 @@

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

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/webui/chrome_url_data_manager.h"

+#include "chrome/common/chrome_content_client.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/jstemplate_builder.h"

-#include "chrome/common/pepper_plugin_registry.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

#include "content/browser/browser_thread.h"

@@ -253,7 +253,8 @@

// See http://crbug.com/50105 for background.

string16 adobereader = ASCIIToUTF16(

webkit::npapi::PluginGroup::kAdobeReaderGroupName);

- string16 internalpdf = ASCIIToUTF16(PepperPluginRegistry::kPDFPluginName);

+ string16 internalpdf =

+ ASCIIToUTF16(chrome::ChromeContentClient::kPDFPluginName);

if (group_name == adobereader) {

plugin_updater->EnablePluginGroup(false, internalpdf);

} else if (group_name == internalpdf) {

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