Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Side by Side Diff: chrome/common/extensions/manifest_handlers/minimum_chrome_version_checker.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, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/common/chrome_paths.cc ('k') | chrome/common/extensions/update_manifest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/extensions/manifest_handlers/minimum_chrome_version_chec ker.h" 5 #include "chrome/common/extensions/manifest_handlers/minimum_chrome_version_chec ker.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "base/version.h" 8 #include "base/version.h"
9 #include "chrome/common/chrome_version_info.h" 9 #include "chrome/common/chrome_version_info.h"
10 #include "extensions/common/error_utils.h" 10 #include "extensions/common/error_utils.h"
(...skipping 15 matching lines...) Expand all
26 26
27 bool MinimumChromeVersionChecker::Parse(Extension* extension, 27 bool MinimumChromeVersionChecker::Parse(Extension* extension,
28 base::string16* error) { 28 base::string16* error) {
29 std::string minimum_version_string; 29 std::string minimum_version_string;
30 if (!extension->manifest()->GetString(keys::kMinimumChromeVersion, 30 if (!extension->manifest()->GetString(keys::kMinimumChromeVersion,
31 &minimum_version_string)) { 31 &minimum_version_string)) {
32 *error = base::ASCIIToUTF16(errors::kInvalidMinimumChromeVersion); 32 *error = base::ASCIIToUTF16(errors::kInvalidMinimumChromeVersion);
33 return false; 33 return false;
34 } 34 }
35 35
36 base::Version minimum_version(minimum_version_string); 36 Version minimum_version(minimum_version_string);
37 if (!minimum_version.IsValid()) { 37 if (!minimum_version.IsValid()) {
38 *error = base::ASCIIToUTF16(errors::kInvalidMinimumChromeVersion); 38 *error = base::ASCIIToUTF16(errors::kInvalidMinimumChromeVersion);
39 return false; 39 return false;
40 } 40 }
41 41
42 chrome::VersionInfo current_version_info; 42 chrome::VersionInfo current_version_info;
43 base::Version current_version(current_version_info.Version()); 43 Version current_version(current_version_info.Version());
44 if (!current_version.IsValid()) { 44 if (!current_version.IsValid()) {
45 NOTREACHED(); 45 NOTREACHED();
46 return false; 46 return false;
47 } 47 }
48 48
49 if (current_version.CompareTo(minimum_version) < 0) { 49 if (current_version.CompareTo(minimum_version) < 0) {
50 *error = ErrorUtils::FormatErrorMessageUTF16( 50 *error = ErrorUtils::FormatErrorMessageUTF16(
51 errors::kChromeVersionTooLow, 51 errors::kChromeVersionTooLow,
52 l10n_util::GetStringUTF8(IDS_PRODUCT_NAME), 52 l10n_util::GetStringUTF8(IDS_PRODUCT_NAME),
53 minimum_version_string); 53 minimum_version_string);
54 return false; 54 return false;
55 } 55 }
56 return true; 56 return true;
57 } 57 }
58 58
59 const std::vector<std::string> MinimumChromeVersionChecker::Keys() const { 59 const std::vector<std::string> MinimumChromeVersionChecker::Keys() const {
60 return SingleKey(keys::kMinimumChromeVersion); 60 return SingleKey(keys::kMinimumChromeVersion);
61 } 61 }
62 62
63 } // namespace extensions 63 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/chrome_paths.cc ('k') | chrome/common/extensions/update_manifest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698