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

Side by Side Diff: chrome/common/extensions/manifest_handlers/minimum_chrome_version_checker.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 unified diff | Download patch
« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | chrome/common/pepper_flash.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/grit/chromium_strings.h" 9 #include "chrome/grit/chromium_strings.h"
10 #include "components/version_info/version_info.h" 10 #include "components/version_info/version_info.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 base::Version current_version(version_info::GetVersionNumber()); 42 Version current_version(version_info::GetVersionNumber());
43 if (!current_version.IsValid()) { 43 if (!current_version.IsValid()) {
44 NOTREACHED(); 44 NOTREACHED();
45 return false; 45 return false;
46 } 46 }
47 47
48 if (current_version.CompareTo(minimum_version) < 0) { 48 if (current_version.CompareTo(minimum_version) < 0) {
49 *error = ErrorUtils::FormatErrorMessageUTF16( 49 *error = ErrorUtils::FormatErrorMessageUTF16(
50 errors::kChromeVersionTooLow, 50 errors::kChromeVersionTooLow,
51 l10n_util::GetStringUTF8(IDS_PRODUCT_NAME), 51 l10n_util::GetStringUTF8(IDS_PRODUCT_NAME),
52 minimum_version_string); 52 minimum_version_string);
53 return false; 53 return false;
54 } 54 }
55 return true; 55 return true;
56 } 56 }
57 57
58 const std::vector<std::string> MinimumChromeVersionChecker::Keys() const { 58 const std::vector<std::string> MinimumChromeVersionChecker::Keys() const {
59 return SingleKey(keys::kMinimumChromeVersion); 59 return SingleKey(keys::kMinimumChromeVersion);
60 } 60 }
61 61
62 } // namespace extensions 62 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | chrome/common/pepper_flash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698