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

Unified Diff: chrome/browser/google/google_update_win.cc

Issue 2718063002: Use install_static::GetAppGuid in place of BrowserDistribution and AppRegistrationData. (Closed)
Patch Set: huangs feedback plus Chromium test fix Created 3 years, 10 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/first_run/upgrade_util_win.cc ('k') | chrome/install_static/install_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/google/google_update_win.cc
diff --git a/chrome/browser/google/google_update_win.cc b/chrome/browser/google/google_update_win.cc
index 0c0d6cc1f90c93ba0c08317da49ca202a9b00ba1..c70b2a1ffaf91845381d916907d1ac862263dd07 100644
--- a/chrome/browser/google/google_update_win.cc
+++ b/chrome/browser/google/google_update_win.cc
@@ -33,6 +33,7 @@
#include "base/win/windows_version.h"
#include "chrome/common/url_constants.h"
#include "chrome/grit/generated_resources.h"
+#include "chrome/install_static/install_util.h"
#include "chrome/installer/util/browser_distribution.h"
#include "chrome/installer/util/google_update_settings.h"
#include "chrome/installer/util/helper.h"
@@ -562,15 +563,14 @@ HRESULT UpdateCheckDriver::BeginUpdateCheckInternal(
// Get a reference to the Chrome app in the bundle.
if (!app_) {
- base::string16 app_guid =
- BrowserDistribution::GetDistribution()->GetAppGuid();
- DCHECK(!app_guid.empty());
+ const wchar_t* app_guid = install_static::GetAppGuid();
+ DCHECK(app_guid);
+ DCHECK(*app_guid);
base::win::ScopedComPtr<IDispatch> dispatch;
// It is common for this call to fail with APP_USING_EXTERNAL_UPDATER if
// an auto update is in progress.
- hresult = app_bundle_->createInstalledApp(
- base::win::ScopedBstr(app_guid.c_str()));
+ hresult = app_bundle_->createInstalledApp(base::win::ScopedBstr(app_guid));
if (FAILED(hresult))
return hresult;
// Move the IAppBundleWeb reference into a local now so that failures from
« no previous file with comments | « chrome/browser/first_run/upgrade_util_win.cc ('k') | chrome/install_static/install_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698