summaryrefslogtreecommitdiffstats
path: root/extensions/common/manifest_handlers
diff options
context:
space:
mode:
authorthakis <thakis@chromium.org>2015-08-18 20:26:57 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-19 03:27:46 +0000
commit37be69cfdb84f4fdabcb779f443d18bbc04f1ffb (patch)
treecb8baf96f447aa5cf415ae19f9f92aa9f43d2d11 /extensions/common/manifest_handlers
parentec748bc5560f56d838178b07313e59bd4136f7ee (diff)
downloadchromium_src-37be69cfdb84f4fdabcb779f443d18bbc04f1ffb.zip
chromium_src-37be69cfdb84f4fdabcb779f443d18bbc04f1ffb.tar.gz
chromium_src-37be69cfdb84f4fdabcb779f443d18bbc04f1ffb.tar.bz2
Revert of base: Remove using:: declaration from version.h header. (patchset #24 id:450001 of https://codereview.chromium.org/1281313003/ )
Reason for revert: Broke all official bots, e.g. http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Win/builds/1926/steps/compile/logs/stdio c:\b\build\slave\google-chrome-rel-win\build\src\chrome\browser\component_updater\pepper_flash_component_installer.cc(326) :error C3861: 'Version': identifier not found Original issue's description: > base: Remove using:: declaration from version.h header. > > BUG=None > R=brettw@chromium.org > > Committed: https://crrev.com/9c2f5dc9c732beb936b41d073bf5ec7adefb0872 > Cr-Commit-Position: refs/heads/master@{#344088} TBR=brettw@chromium.org,tfarina@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=None Review URL: https://codereview.chromium.org/1301883002 Cr-Commit-Position: refs/heads/master@{#344138}
Diffstat (limited to 'extensions/common/manifest_handlers')
-rw-r--r--extensions/common/manifest_handlers/shared_module_info.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/common/manifest_handlers/shared_module_info.cc b/extensions/common/manifest_handlers/shared_module_info.cc
index edac891..99efe88 100644
--- a/extensions/common/manifest_handlers/shared_module_info.cc
+++ b/extensions/common/manifest_handlers/shared_module_info.cc
@@ -183,7 +183,7 @@ bool SharedModuleInfo::Parse(const Extension* extension,
return false;
}
imports_.back().minimum_version = min_version;
- base::Version v(min_version);
+ Version v(min_version);
if (!v.IsValid()) {
*error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidImportVersion, base::IntToString(i));