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

Unified Diff: chrome/browser/chromeos/login/version_info_updater.cc

Issue 8588006: Eliminate CrosLibrary::EnsureLoaded (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 9 years, 1 month 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/chromeos/login/user_manager.cc ('k') | chrome/browser/chromeos/sms_observer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/version_info_updater.cc
diff --git a/chrome/browser/chromeos/login/version_info_updater.cc b/chrome/browser/chromeos/login/version_info_updater.cc
index 71c41cf0cad20715441f43fa290383bf70387b7a..59300ccd74821093e7c9b63881d39fd7f6cf62ce 100644
--- a/chrome/browser/chromeos/login/version_info_updater.cc
+++ b/chrome/browser/chromeos/login/version_info_updater.cc
@@ -15,6 +15,7 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/system/runtime_environment.h"
#include "chrome/browser/policy/browser_policy_connector.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/common/chrome_version_info.h"
@@ -43,7 +44,7 @@ VersionInfoUpdater::~VersionInfoUpdater() {
}
void VersionInfoUpdater::StartUpdate(bool is_official_build) {
- if (CrosLibrary::Get()->EnsureLoaded()) {
+ if (system::runtime_environment::IsRunningOnChromeOS()) {
version_loader_.GetVersion(
&version_consumer_,
base::Bind(&VersionInfoUpdater::OnVersion, base::Unretained(this)),
@@ -78,7 +79,7 @@ void VersionInfoUpdater::StartUpdate(bool is_official_build) {
}
void VersionInfoUpdater::UpdateVersionLabel() {
- if (!CrosLibrary::Get()->EnsureLoaded()) {
+ if (!system::runtime_environment::IsRunningOnChromeOS()) {
if (delegate_) {
delegate_->OnOSVersionLabelTextUpdated(
CrosLibrary::Get()->load_error_string());
« no previous file with comments | « chrome/browser/chromeos/login/user_manager.cc ('k') | chrome/browser/chromeos/sms_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698