chrome/browser/gtk/content_setting_bubble_gtk.cc - Issue 5961004: Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugin...

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/gtk/content_setting_bubble_gtk.cc

Issue 5961004: Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugin... (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/browser/gtk/content_setting_bubble_gtk.cc

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

--- chrome/browser/gtk/content_setting_bubble_gtk.cc (revision 69765)

+++ chrome/browser/gtk/content_setting_bubble_gtk.cc (working copy)

@@ -27,7 +27,7 @@

#include "gfx/gtk_util.h"

#include "grit/app_resources.h"

#include "grit/generated_resources.h"

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

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

namespace {

@@ -109,7 +109,7 @@

for (std::set<std::string>::const_iterator it = plugins.begin();

it != plugins.end(); ++it) {

std::string name = UTF16ToUTF8(

- webkit::npapi::PluginList::Singleton()->GetPluginGroupName(*it));

+ NPAPI::PluginList::Singleton()->GetPluginGroupName(*it));

if (name.empty())

name = *it;

Property changes on: chrome/browser/gtk/content_setting_bubble_gtk.cc

___________________________________________________________________

Deleted: svn:mergeinfo

« no previous file with comments | « chrome/browser/dom_ui/plugins_ui.cc ('k') | chrome/browser/hang_monitor/hung_plugin_action.cc » ('j') | no next file with comments »