Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / help / version_updater_win.cc

diff --git a/src/chrome/browser/ui/webui/help/version_updater_win.cc b/src/chrome/browser/ui/webui/help/version_updater_win.cc
index b6b38e5..1e79c54 100644 (file)
--- a/src/chrome/browser/ui/webui/help/version_updater_win.cc
+++ b/src/chrome/browser/ui/webui/help/version_updater_win.cc
@@ -14,16 +14,14 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/webui/help/version_updater.h"
 #include "chrome/common/chrome_version_info.h"
+#include "chrome/grit/chromium_strings.h"
+#include "chrome/grit/generated_resources.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/install_util.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/user_metrics.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/widget/widget.h"
 
-using base::UserMetricsAction;
 using content::BrowserThread;
 
 namespace {
@@ -41,14 +39,14 @@ class VersionUpdaterWin : public VersionUpdater,
   virtual ~VersionUpdaterWin();
 
   // VersionUpdater implementation.
-  virtual void CheckForUpdate(const StatusCallback& callback) OVERRIDE;
-  virtual void RelaunchBrowser() const OVERRIDE;
+  virtual void CheckForUpdate(const StatusCallback& callback) override;
+  virtual void RelaunchBrowser() const override;
 
   // GoogleUpdateStatusListener implementation.
   virtual void OnReportResults(GoogleUpdateUpgradeResult result,
                                GoogleUpdateErrorCode error_code,
                                const base::string16& error_message,
-                               const base::string16& version) OVERRIDE;
+                               const base::string16& version) override;
 
   // Update the UI to show the status of the upgrade.
   void UpdateStatus(GoogleUpdateUpgradeResult result,
@@ -178,18 +176,14 @@ void VersionUpdaterWin::UpdateStatus(GoogleUpdateUpgradeResult result,
 
   switch (result) {
     case UPGRADE_CHECK_STARTED: {
-      content::RecordAction(UserMetricsAction("UpgradeCheck_Started"));
       status = CHECKING;
       break;
     }
     case UPGRADE_STARTED: {
-      content::RecordAction(UserMetricsAction("Upgrade_Started"));
       status = UPDATING;
       break;
     }
     case UPGRADE_IS_AVAILABLE: {
-      content::RecordAction(
-          UserMetricsAction("UpgradeCheck_UpgradeIsAvailable"));
       DCHECK(!google_updater_);  // Should have been nulled out already.
       CreateGoogleUpdater();
       UpdateStatus(UPGRADE_STARTED, GOOGLE_UPDATE_NO_ERROR, base::string16());
@@ -208,12 +202,10 @@ void VersionUpdaterWin::UpdateStatus(GoogleUpdateUpgradeResult result,
       return;
     }
     case UPGRADE_SUCCESSFUL: {
-      content::RecordAction(UserMetricsAction("UpgradeCheck_Upgraded"));
       status = NEARLY_UPDATED;
       break;
     }
     case UPGRADE_ERROR: {
-      content::RecordAction(UserMetricsAction("UpgradeCheck_Error"));
       status = FAILED;
       if (error_code == GOOGLE_UPDATE_DISABLED_BY_POLICY) {
         message =
@@ -243,7 +235,7 @@ void VersionUpdaterWin::UpdateStatus(GoogleUpdateUpgradeResult result,
 
 void VersionUpdaterWin::GotInstalledVersion(const Version& version) {
   // This must be called on the UI thread so that callback_ can be called.
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Make sure that the latest version is running and if not,
   // notify the user by setting the status to NEARLY_UPDATED.
@@ -253,14 +245,11 @@ void VersionUpdaterWin::GotInstalledVersion(const Version& version) {
   // out of date.
   chrome::VersionInfo version_info;
   Version running_version(version_info.Version());
-  if (!version.IsValid() || version.CompareTo(running_version) <= 0) {
-    content::RecordAction(
-        UserMetricsAction("UpgradeCheck_AlreadyUpToDate"));
-    callback_.Run(UPDATED, 0, base::string16());
-  } else {
-    content::RecordAction(UserMetricsAction("UpgradeCheck_AlreadyUpgraded"));
-    callback_.Run(NEARLY_UPDATED, 0, base::string16());
-  }
+  callback_.Run((version.IsValid() && version.CompareTo(running_version) > 0)
+                    ? NEARLY_UPDATED
+                    : UPDATED,
+                0,
+                base::string16());
 }
 
 void VersionUpdaterWin::CreateGoogleUpdater() {
@@ -287,7 +276,7 @@ BOOL CALLBACK WindowEnumeration(HWND window, LPARAM param) {
 
 HWND VersionUpdaterWin::GetElevationParent() {
   // Look for a visible window belonging to the UI thread.
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   HWND window = NULL;
   EnumThreadWindows(GetCurrentThreadId(),
                     WindowEnumeration,