chrome/browser/ui/webui/version_handler.cc - Issue 22723004: Get rid of webkit/plugins/plugin_constants.* and move them to content/public/common/content_constan…

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/version_handler.cc

Issue 22723004: Get rid of webkit/plugins/plugin_constants.* and move them to content/public/common/content_constan… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 years, 4 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/version_handler.cc

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

--- chrome/browser/ui/webui/version_handler.cc (revision 216518)

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

@@ -14,10 +14,10 @@

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/plugin_service.h"

#include "content/public/browser/web_ui.h"

+#include "content/public/common/content_constants.h"

#include "grit/generated_resources.h"

#include "ui/base/l10n/l10n_util.h"

#include "url/gurl.h"

-#include "webkit/plugins/plugin_constants.h"

namespace {

@@ -133,7 +133,7 @@

// Obtain the version of the first enabled Flash plugin.

std::vector<content::WebPluginInfo> info_array;

content::PluginService::GetInstance()->GetPluginInfoArray(

- GURL(), kFlashPluginSwfMimeType, false, &info_array, NULL);

+ GURL(), content::kFlashPluginSwfMimeType, false, &info_array, NULL);

string16 flash_version =

l10n_util::GetStringUTF16(IDS_PLUGINS_DISABLED_PLUGIN);

PluginPrefs* plugin_prefs =

« no previous file with comments | « chrome/browser/ui/webui/flash_ui.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »