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

Unified Diff: chrome/browser/ui/webui/help/version_updater_chromeos.cc

Issue 10698106: Switch about box to web ui on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed a merge issue where ChromeOS started using google_update.h again. Created 8 years, 5 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
« no previous file with comments | « chrome/browser/ui/webui/help/help_handler.cc ('k') | chrome/browser/ui/webui/help/version_updater_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/help/version_updater_chromeos.cc
diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos.cc b/chrome/browser/ui/webui/help/version_updater_chromeos.cc
index 4adf8fad6a18fe4e9bc569332101cf6e6507b869..898df97fbe059c9ece2bb8455b8023b67aac25d2 100644
--- a/chrome/browser/ui/webui/help/version_updater_chromeos.cc
+++ b/chrome/browser/ui/webui/help/version_updater_chromeos.cc
@@ -12,7 +12,6 @@
#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 "chrome/browser/google/google_update.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/power_manager_client.h"
#include "grit/generated_resources.h"
@@ -101,8 +100,7 @@ void VersionUpdaterCros::UpdateStatusChanged(
case UpdateEngineClient::UPDATE_STATUS_REPORTING_ERROR_EVENT:
my_status = FAILED;
// TODO(derat): More-detailed error info if UpdateEngineClient exposes it.
- message = l10n_util::GetStringFUTF16Int(IDS_UPGRADE_ERROR,
- GOOGLE_UPDATE_ERROR_UPDATING);
+ message = l10n_util::GetStringFUTF16Int(IDS_UPGRADE_ERROR, 7);
Daniel Erat 2012/07/13 19:27:56 this is fine with me, but mind adding a comment li
MAD 2012/07/13 19:36:59 Done.
break;
case UpdateEngineClient::UPDATE_STATUS_CHECKING_FOR_UPDATE:
my_status = CHECKING;
« no previous file with comments | « chrome/browser/ui/webui/help/help_handler.cc ('k') | chrome/browser/ui/webui/help/version_updater_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698