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

Unified Diff: chrome/browser/ui/browser_list.cc

Issue 8585025: chromeos: Change all clients of UpdateLibrary to use UpdateEngineClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments 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
Index: chrome/browser/ui/browser_list.cc
diff --git a/chrome/browser/ui/browser_list.cc b/chrome/browser/ui/browser_list.cc
index 52ac775ba1fedcecc87951301519a0d76178b5ab..daaead65e414840c0c2c728f111c15a82183655a 100644
--- a/chrome/browser/ui/browser_list.cc
+++ b/chrome/browser/ui/browser_list.cc
@@ -31,10 +31,9 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/boot_times_loader.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/update_library.h"
#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
#include "chrome/browser/chromeos/dbus/session_manager_client.h"
+#include "chrome/browser/chromeos/dbus/update_engine_client.h"
#include "chrome/browser/chromeos/system/runtime_environment.h"
#if defined(TOOLKIT_USES_GTK)
#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
@@ -334,11 +333,12 @@ void BrowserList::NotifyAndTerminate(bool fast_path) {
#if defined(OS_CHROMEOS)
NotifyWindowManagerAboutSignout();
if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) {
+ chromeos::UpdateEngineClient* update_engine_client
+ = chromeos::DBusThreadManager::Get()->GetUpdateEngineClient();
// If update has been installed, reboot, otherwise, sign out.
- chromeos::CrosLibrary* cros_library = chromeos::CrosLibrary::Get();
- if (cros_library->GetUpdateLibrary()->status().status ==
- chromeos::UPDATE_STATUS_UPDATED_NEED_REBOOT) {
- cros_library->GetUpdateLibrary()->RebootAfterUpdate();
+ if (update_engine_client->GetLastStatus().status ==
+ chromeos::UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT) {
+ update_engine_client->RebootAfterUpdate();
} else {
chromeos::DBusThreadManager::Get()->GetSessionManagerClient()
->StopSession();
« no previous file with comments | « chrome/browser/policy/device_policy_cache.cc ('k') | chrome/browser/ui/webui/options/chromeos/about_page_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698