summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-24 09:16:15 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-24 09:16:15 +0000
commit58e2dfd2b646ccf2246ac0827d2376d5b8c79384 (patch)
tree168f6310ba7cfc035117ad10a10eb513f098e0a7 /chrome
parent09bec861f07dda20e2803c72c3805d53df203fcd (diff)
downloadchromium_src-58e2dfd2b646ccf2246ac0827d2376d5b8c79384.zip
chromium_src-58e2dfd2b646ccf2246ac0827d2376d5b8c79384.tar.gz
chromium_src-58e2dfd2b646ccf2246ac0827d2376d5b8c79384.tar.bz2
Wording change for the upgrade detection mechanism and increase timer to check daily (as opposed to every hour).
BUG=50070 TEST=None (everything should work as before, with new wording for the upgrade reminder and a longer timer to trigger) Review URL: http://codereview.chromium.org/3009021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53577 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/generated_resources.grd11
-rw-r--r--chrome/browser/upgrade_detector.cc10
2 files changed, 7 insertions, 14 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index fb07d0e..1c9c4af 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7569,20 +7569,17 @@ Keep your key file in a safe place. You will need it to create new versions of y
<!-- Update Recommended dialog -->
<message name="IDS_UPDATE_RECOMMENDED" desc="The main text of the Update Recommended dialog.">
- Old school's not cool. <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is woefully out of date because it hasn't crashed or restarted in a while. Restart to apply update.
+ <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is out of date because it hasn't been restarted in a while. An update is available and will be applied as soon as you restart.
+ </message>
+ <message name="IDS_RESTART_AND_UPDATE" desc="The button label for restarting and updating Chrome.">
+ Restart
</message>
<if expr="not pp_ifdef('use_titlecase')">
- <message name="IDS_RESTART_AND_UPDATE" desc="The button label for restarting and updating Chrome.">
- Restart and update
- </message>
<message name="IDS_NOT_NOW" desc="The button label for delaying the restart and updating Chrome.">
Not now
</message>
</if>
<if expr="pp_ifdef('use_titlecase')">
- <message name="IDS_RESTART_AND_UPDATE" desc="In Tile Case: The button label for restarting and updating Chrome.">
- Update and Restart
- </message>
<message name="IDS_NOT_NOW" desc="In Tile Case: The button label for delaying the restart and updating Chrome.">
Not Now
</message>
diff --git a/chrome/browser/upgrade_detector.cc b/chrome/browser/upgrade_detector.cc
index 38bd2cd..8001797 100644
--- a/chrome/browser/upgrade_detector.cc
+++ b/chrome/browser/upgrade_detector.cc
@@ -31,16 +31,12 @@
#include "chrome/installer/util/version.h"
#endif
-// TODO(finnur): For the stable channel we want to check daily and notify
-// the user if more than 2 weeks have passed since the upgrade happened
-// (without a reboot). For the dev channel however, I want quicker feedback
-// on how the feature works so I'm checking every hour and notifying the
-// user immediately.
-
namespace {
// How often to check for an upgrade.
-const int kCheckForUpgradeEveryMs = 60 * 60 * 1000; // 1 hour.
+// TODO(finnur): Once we have a good way of determining which branch the user
+// is on at runtime we should check more frequently for the dev branch.
+const int kCheckForUpgradeEveryMs = 24 * 60 * 60 * 1000; // Check daily.
// How long to wait before notifying the user about the upgrade.
const int kNotifyUserAfterMs = 0;