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

Unified Diff: chrome/browser/chromeos/cros/update_library.cc

Issue 7891021: Use stub impl when libcros fails to load (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase with power library changes Created 9 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/cros/update_library.cc
diff --git a/chrome/browser/chromeos/cros/update_library.cc b/chrome/browser/chromeos/cros/update_library.cc
index 1466b0e558813aa25710087391237b5dc735d5e4..3e8ce710c7936a5ed04903811e169baa1d9c2bea 100644
--- a/chrome/browser/chromeos/cros/update_library.cc
+++ b/chrome/browser/chromeos/cros/update_library.cc
@@ -27,13 +27,12 @@ class UpdateLibraryImpl : public UpdateLibrary {
// Begin UpdateLibrary implementation.
virtual void Init() OVERRIDE {
- if (CrosLibrary::Get()->EnsureLoaded()) {
- CHECK(!status_connection_) << "Already initialized";
- status_connection_ =
- chromeos::MonitorUpdateStatus(&UpdateStatusHandler, this);
- // Asynchronously load the initial state.
- chromeos::RequestUpdateStatus(&UpdateStatusHandler, this);
- }
+ DCHECK(CrosLibrary::Get()->libcros_loaded());
+ CHECK(!status_connection_) << "Already initialized";
+ status_connection_ =
+ chromeos::MonitorUpdateStatus(&UpdateStatusHandler, this);
+ // Asynchronously load the initial state.
+ chromeos::RequestUpdateStatus(&UpdateStatusHandler, this);
}
virtual void AddObserver(Observer* observer) OVERRIDE {
@@ -50,26 +49,20 @@ class UpdateLibraryImpl : public UpdateLibrary {
virtual void RequestUpdateCheck(chromeos::UpdateCallback callback,
void* user_data) OVERRIDE {
- if (CrosLibrary::Get()->EnsureLoaded())
- chromeos::RequestUpdateCheck(callback, user_data);
+ chromeos::RequestUpdateCheck(callback, user_data);
}
virtual bool RebootAfterUpdate() OVERRIDE {
- if (!CrosLibrary::Get()->EnsureLoaded())
- return false;
-
return RebootIfUpdated();
}
virtual void SetReleaseTrack(const std::string& track) OVERRIDE {
- if (CrosLibrary::Get()->EnsureLoaded())
- chromeos::SetUpdateTrack(track);
+ chromeos::SetUpdateTrack(track);
}
virtual void GetReleaseTrack(chromeos::UpdateTrackCallback callback,
void* user_data) OVERRIDE {
- if (CrosLibrary::Get()->EnsureLoaded())
- chromeos::RequestUpdateTrack(callback, user_data);
+ chromeos::RequestUpdateTrack(callback, user_data);
}
// End UpdateLibrary implementation.
« no previous file with comments | « chrome/browser/chromeos/cros/speech_synthesis_library.cc ('k') | chrome/browser/chromeos/status/power_menu_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698