chrome/browser/extensions/external_provider_impl.cc - Issue 109673004: Revert "Update all users of base::Version to explicitly specify the namespace, and clean up the hea…

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/extensions/external_provider_impl.cc

Issue 109673004: Revert "Update all users of base::Version to explicitly specify the namespace, and clean up the hea… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 12 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/external_policy_loader_unittest.cc ('k') | chrome/browser/extensions/external_registry_loader_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/external_provider_impl.cc

diff --git a/chrome/browser/extensions/external_provider_impl.cc b/chrome/browser/extensions/external_provider_impl.cc

index 1eebfc1981abbc01fc806b5f964438536456abb1..1a85f5ff1851dfd46f796f3a9f1579457f70c2a1 100644

--- a/chrome/browser/extensions/external_provider_impl.cc

+++ b/chrome/browser/extensions/external_provider_impl.cc

@@ -246,7 +246,7 @@ void ExternalProviderImpl::SetPrefs(base::DictionaryValue* prefs) {

path = base_path.Append(external_crx);

}

- base::Version version(external_version);

+ Version version(external_version);

if (!version.IsValid()) {

LOG(WARNING) << "Malformed extension dictionary for extension: "

<< extension_id.c_str() << ". Invalid version string \""

@@ -305,7 +305,7 @@ bool ExternalProviderImpl::HasExtension(

bool ExternalProviderImpl::GetExtensionDetails(

const std::string& id, Manifest::Location* location,

- scoped_ptr<base::Version>* version) const {

+ scoped_ptr<Version>* version) const {

CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

CHECK(prefs_.get());

CHECK(ready_);

@@ -325,7 +325,7 @@ bool ExternalProviderImpl::GetExtensionDetails(

return false;

if (version)

- version->reset(new base::Version(external_version));

+ version->reset(new Version(external_version));

} else {

NOTREACHED(); // Chrome should not allow prefs to get into this state.