chrome/browser/hang_monitor/hung_plugin_action.cc - Issue 1281313003: 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/browser/hang_monitor/hung_plugin_action.cc

Issue 1281313003: base: Remove using:: declaration from version.h header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more fixes 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/extensions/webstore_installer.cc ('k') | chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/hang_monitor/hung_plugin_action.cc

diff --git a/chrome/browser/hang_monitor/hung_plugin_action.cc b/chrome/browser/hang_monitor/hung_plugin_action.cc

index 82142862ab0ad00c4cb6474dd4647c88ecf825b0..9e676150368664b121398f6db7e76de7d9bdb976 100644

--- a/chrome/browser/hang_monitor/hung_plugin_action.cc

+++ b/chrome/browser/hang_monitor/hung_plugin_action.cc

@@ -40,7 +40,7 @@ enum GTalkPluginLogVersion {

// 10 * major + minor - kGTalkPluginLogMinVersion.

GTalkPluginLogVersion GetGTalkPluginVersion(const base::string16& version) {

int gtalk_plugin_version = GTALK_PLUGIN_VERSION_MIN;

- Version plugin_version;

+ base::Version plugin_version;

content::WebPluginInfo::CreateVersionFromString(version, &plugin_version);

if (plugin_version.IsValid() && plugin_version.components().size() >= 2) {

gtalk_plugin_version = 10 * plugin_version.components()[0] +