chrome/common/chrome_content_client.cc - Issue 2256363002: Attempt to remove non-namespaced base::Version usage.

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_content_client.cc

Issue 2256363002: Attempt to remove non-namespaced base::Version usage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased against master. Created 4 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

« no previous file with comments | « chrome/browser/win/enumerate_modules_model.cc ('k') | chrome/common/extensions/manifest_handlers/minimum_chrome_version_checker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/chrome_content_client.cc

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

index f64e323742bae73b0efd87cb7e6dcbcd3fcb5273..2db20d9c121de1a6eef0dccacb39daaf2feed16c 100644

--- a/chrome/common/chrome_content_client.cc

+++ b/chrome/common/chrome_content_client.cc

@@ -401,7 +401,7 @@ bool GetSystemPepperFlash(content::PepperPluginInfo* plugin) {

if (!manifest_value->GetAsDictionary(&manifest))

return false;

- Version version;

+ base::Version version;

if (!chrome::CheckPepperFlashManifest(*manifest, &version))

return false;

@@ -503,7 +503,7 @@ content::PepperPluginInfo* ChromeContentClient::FindMostRecentPlugin(

std::map<PluginSortKey, content::PepperPluginInfo*> plugin_map;

for (auto* plugin : plugins) {

- Version version(plugin->version);

+ base::Version version(plugin->version);

DCHECK(version.IsValid());

plugin_map[PluginSortKey(version, plugin->is_debug,

plugin->is_bundled, plugin->is_on_local_drive,