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

Side by Side Diff: chrome/common/extensions/manifest_handlers/minimum_chrome_version_checker.cc

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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
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"
10 #include "chrome/grit/chromium_strings.h" 9 #include "chrome/grit/chromium_strings.h"
10 #include "components/version_info/version_info.h"
11 #include "extensions/common/error_utils.h" 11 #include "extensions/common/error_utils.h"
12 #include "extensions/common/extension.h" 12 #include "extensions/common/extension.h"
13 #include "extensions/common/manifest_constants.h" 13 #include "extensions/common/manifest_constants.h"
14 #include "ui/base/l10n/l10n_util.h" 14 #include "ui/base/l10n/l10n_util.h"
15 15
16 namespace extensions { 16 namespace extensions {
17 17
18 namespace keys = manifest_keys; 18 namespace keys = manifest_keys;
19 namespace errors = manifest_errors; 19 namespace errors = manifest_errors;
20 20
(...skipping 11 matching lines...) Expand all
32 *error = base::ASCIIToUTF16(errors::kInvalidMinimumChromeVersion); 32 *error = base::ASCIIToUTF16(errors::kInvalidMinimumChromeVersion);
33 return false; 33 return false;
34 } 34 }
35 35
36 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 Version current_version(version_info::GetVersionNumber());
43 Version current_version(current_version_info.Version());
44 if (!current_version.IsValid()) { 43 if (!current_version.IsValid()) {
45 NOTREACHED(); 44 NOTREACHED();
46 return false; 45 return false;
47 } 46 }
48 47
49 if (current_version.CompareTo(minimum_version) < 0) { 48 if (current_version.CompareTo(minimum_version) < 0) {
50 *error = ErrorUtils::FormatErrorMessageUTF16( 49 *error = ErrorUtils::FormatErrorMessageUTF16(
51 errors::kChromeVersionTooLow, 50 errors::kChromeVersionTooLow,
52 l10n_util::GetStringUTF8(IDS_PRODUCT_NAME), 51 l10n_util::GetStringUTF8(IDS_PRODUCT_NAME),
53 minimum_version_string); 52 minimum_version_string);
54 return false; 53 return false;
55 } 54 }
56 return true; 55 return true;
57 } 56 }
58 57
59 const std::vector<std::string> MinimumChromeVersionChecker::Keys() const { 58 const std::vector<std::string> MinimumChromeVersionChecker::Keys() const {
60 return SingleKey(keys::kMinimumChromeVersion); 59 return SingleKey(keys::kMinimumChromeVersion);
61 } 60 }
62 61
63 } // namespace extensions 62 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698