chrome/common/chrome_plugin_lib.cc - Issue 5996003: Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

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/common/chrome_plugin_lib.cc

Issue 5996003: Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 10 years 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/common/chrome_plugin_lib.cc

diff --git a/chrome/common/chrome_plugin_lib.cc b/chrome/common/chrome_plugin_lib.cc

index 3277f4a44ef6a99a8d3ee7f41c20695edf9184c6..1bd118b7c596b5e2f7d15a951c9b8caabe416f7b 100644

--- a/chrome/common/chrome_plugin_lib.cc

+++ b/chrome/common/chrome_plugin_lib.cc

@@ -19,7 +19,7 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/notification_service.h"

#include "chrome/common/chrome_paths.h"

-#include "webkit/glue/plugins/plugin_list.h"

+#include "webkit/plugins/npapi/plugin_list.h"

using base::TimeDelta;

@@ -114,7 +114,7 @@ void ChromePluginLib::RegisterPluginsWithNPAPI() {

FilePath path;

// Register Gears, if available.

if (PathService::Get(chrome::FILE_GEARS_PLUGIN, &path))

- NPAPI::PluginList::Singleton()->AddExtraPluginPath(path);

+ webkit::npapi::PluginList::Singleton()->AddExtraPluginPath(path);

}

static void LogPluginLoadTime(const TimeDelta &time) {

« no previous file with comments | « chrome/browser/ui/cocoa/table_model_array_controller_unittest.mm ('k') | chrome/common/default_plugin.cc » ('j') | no next file with comments »