Switch to using the WebUI About screen on Windows.

chrome/browser/ui/webui/help/version_updater_chromeos.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/help/version_updater_chromeos.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/cros_settings_names.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 
 using chromeos::CrosSettings;
 using chromeos::DBusThreadManager;
 using chromeos::UpdateEngineClient;
 using chromeos::UserManager;
 using chromeos::WizardController;
 
 VersionUpdater* VersionUpdater::Create() {
   return new VersionUpdaterCros;
 }
 
+VersionUpdaterCros::VersionUpdaterCros() {}
+
+VersionUpdaterCros::~VersionUpdaterCros() {
+  UpdateEngineClient* update_engine_client =
+      DBusThreadManager::Get()->GetUpdateEngineClient();
+  update_engine_client->RemoveObserver(this);
+}
+
 void VersionUpdaterCros::CheckForUpdate(const StatusCallback& callback) {
   callback_ = callback;
 
   UpdateEngineClient* update_engine_client =
       DBusThreadManager::Get()->GetUpdateEngineClient();
   update_engine_client->AddObserver(this);
 
   // Make sure that libcros is loaded and OOBE is complete.
   if (!WizardController::default_controller() ||
       WizardController::IsDeviceRegistered()) {
@@ skipping 21 matching lines @@
   UpdateEngineClient* update_engine_client =
       DBusThreadManager::Get()->GetUpdateEngineClient();
 
   // Request the channel information. Use the observer to track the help page
   // handler and ensure it does not get deleted before the callback.
   update_engine_client->GetReleaseTrack(
       base::Bind(&VersionUpdaterCros::UpdateSelectedChannel,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
+<<<<<<< HEAD
 VersionUpdaterCros::VersionUpdaterCros() : weak_ptr_factory_(this) {}
 
 VersionUpdaterCros::~VersionUpdaterCros() {
   UpdateEngineClient* update_engine_client =
       DBusThreadManager::Get()->GetUpdateEngineClient();
   update_engine_client->RemoveObserver(this);
 }
 
+=======
+>>>>>>> patch from issue 9700049
 void VersionUpdaterCros::UpdateStatusChanged(
     const UpdateEngineClient::Status& status) {
   Status my_status = UPDATED;
   int progress = 0;
 
   switch (status.status) {
     case UpdateEngineClient::UPDATE_STATUS_CHECKING_FOR_UPDATE:
       my_status = CHECKING;
       break;
     case UpdateEngineClient::UPDATE_STATUS_DOWNLOADING:
@@ skipping 24 matching lines @@
     UpdateEngineClient::UpdateCheckResult result) {
   // If version updating is not implemented, this binary is the most up-to-date
   // possible with respect to automatic updating.
   if (result == UpdateEngineClient::UPDATE_RESULT_NOTIMPLEMENTED)
     callback_.Run(UPDATED, 0, string16());
 }
 
 void VersionUpdaterCros::UpdateSelectedChannel(const std::string& channel) {
   channel_callback_.Run(channel);
 }