chrome/common/chrome_content_client.cc - Issue 1301883002: Revert of base: Remove using:: declaration from version.h header.

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 1301883002: Revert of base: Remove using:: declaration from version.h header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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/upgrade_detector_impl.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 1c3ca162412c2aba0b6f37535b29907960fe9c99..bc33c6275c21ffe2ca05de3426e6fb0b5a259e4e 100644

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

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

@@ -368,7 +368,7 @@

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

return false;

- base::Version version;

+ Version version;

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

return false;

@@ -455,7 +455,7 @@

auto it = std::max_element(

plugins.begin(), plugins.end(),

[](content::PepperPluginInfo* x, content::PepperPluginInfo* y) {

- base::Version version_x(x->version);

+ Version version_x(x->version);

DCHECK(version_x.IsValid());

return version_x.IsOlderThan(y->version);

});