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

Unified Diff: chrome/browser/ui/views/about_chrome_view.cc

Issue 6243007: Make sure we show the restart message if system level Chrome has been upgrade... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/about_chrome_view.cc
===================================================================
--- chrome/browser/ui/views/about_chrome_view.cc (revision 71590)
+++ chrome/browser/ui/views/about_chrome_view.cc (working copy)
@@ -159,6 +159,8 @@
current_version_ = version_info.Version();
+ // GetVersionStringModifier hits the registry. See http://crbug.com/69936.
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
std::string version_modifier = platform_util::GetVersionStringModifier();
if (!version_modifier.empty())
version_details_ += " " + version_modifier;
@@ -752,8 +754,14 @@
// are running the latest version and if not, notify the user by falling
// into the next case of UPGRADE_SUCCESSFUL.
BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+ // GetChromeVersion hits the registry. See http://crbug.com/69936.
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
huanr 2011/01/18 19:30:55 When can UpdateStatus() be called? Does it run in
Finnur 2011/01/18 23:25:30 Nope, this is "About Box"-specific. This code only
huanr 2011/01/18 23:34:22 If we are certain the code only runs when the user
scoped_ptr<Version> installed_version(
InstallUtil::GetChromeVersion(dist, false));
+ if (!installed_version.get()) {
+ // User-level Chrome is not installed, check system-level.
+ installed_version.reset(InstallUtil::GetChromeVersion(dist, true));
+ }
scoped_ptr<Version> running_version(
Version::GetVersionFromString(current_version_));
if (!installed_version.get() ||
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698