chrome/browser/tab_contents/tab_contents.cc - Issue 5998002: Revert "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/browser/tab_contents/tab_contents.cc

Issue 5998002: Revert "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

« no previous file with comments | « chrome/browser/renderer_host/test/test_render_view_host.h ('k') | chrome/browser/ui/cocoa/table_model_array_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/tab_contents/tab_contents.cc

diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc

index 8f5ed48125bc31c5451fb36b35f632c7c1950119..46498e31d9d611206744c7e2c3970debc5017ee6 100644

--- a/chrome/browser/tab_contents/tab_contents.cc

+++ b/chrome/browser/tab_contents/tab_contents.cc

@@ -113,7 +113,7 @@

#include "third_party/WebKit/WebKit/chromium/public/WebView.h"

#include "webkit/glue/webpreferences.h"

#include "webkit/glue/password_form.h"

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

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

// Cross-Site Navigations

@@ -2091,8 +2091,8 @@ void TabContents::OnCrashedPlugin(const FilePath& plugin_path) {

DCHECK(!plugin_path.value().empty());

std::wstring plugin_name = plugin_path.ToWStringHack();

- webkit::npapi::WebPluginInfo plugin_info;

- if (webkit::npapi::PluginList::Singleton()->GetPluginInfoByPath(

+ WebPluginInfo plugin_info;

+ if (NPAPI::PluginList::Singleton()->GetPluginInfoByPath(

plugin_path, &plugin_info) &&

!plugin_info.name.empty()) {

plugin_name = UTF16ToWide(plugin_info.name);