Chromium Code Reviews| Index: chrome/browser/ui/views/app_list/app_list_controller_win.cc |
| diff --git a/chrome/browser/ui/views/app_list/app_list_controller_win.cc b/chrome/browser/ui/views/app_list/app_list_controller_win.cc |
| index 6b22f01c5376f230c45661fd1c0c54b836823f00..e14d2a97ac423eca8cff490c3e259cdad9521eac 100644 |
| --- a/chrome/browser/ui/views/app_list/app_list_controller_win.cc |
| +++ b/chrome/browser/ui/views/app_list/app_list_controller_win.cc |
| @@ -45,6 +45,7 @@ |
| #include "chrome/installer/launcher_support/chrome_launcher_support.h" |
| #include "chrome/installer/util/browser_distribution.h" |
| #include "chrome/installer/util/google_update_settings.h" |
| +#include "chrome/installer/util/install_util.h" |
| #include "chrome/installer/util/util_constants.h" |
| #include "content/public/browser/browser_thread.h" |
| #include "content/public/browser/notification_details.h" |
| @@ -151,16 +152,25 @@ string16 GetAppModelId() { |
| void SetDidRunForNDayActiveStats() { |
| DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread()); |
| - |
| - chrome_launcher_support::InstallationState launcher_state = |
| - chrome_launcher_support::GetAppLauncherInstallationState(); |
| - if (launcher_state != chrome_launcher_support::NOT_INSTALLED) { |
| - BrowserDistribution* dist = BrowserDistribution::GetSpecificDistribution( |
| - BrowserDistribution::CHROME_APP_HOST); |
| + base::FilePath exe_path; |
| + if (!PathService::Get(base::DIR_EXE, &exe_path)) { |
| + NOTREACHED(); |
| + return; |
| + } |
| + bool system_install = |
| + !InstallUtil::IsPerUserInstall(exe_path.value().c_str()); |
| + BrowserDistribution* chrome_binaries_dist = |
|
huangs
2013/05/08 01:22:02
Need to use |chrome_binaries_dist|, so IsMultiInst
benwells
2013/05/08 02:09:34
We only need tracking for normal chrome users. Doe
grt (UTC plus 2)
2013/05/08 19:36:09
As discussed, please add a comment here stating th
|
| + BrowserDistribution::GetSpecificDistribution( |
| + BrowserDistribution::CHROME_BINARIES); |
| + if (chrome_binaries_dist && |
| + InstallUtil::IsMultiInstall(chrome_binaries_dist, system_install)) { |
| + BrowserDistribution* app_launcher_dist = |
| + BrowserDistribution::GetSpecificDistribution( |
| + BrowserDistribution::CHROME_APP_HOST); |
| GoogleUpdateSettings::UpdateDidRunStateForDistribution( |
| - dist, |
| + app_launcher_dist, |
| true /* did_run */, |
| - launcher_state == chrome_launcher_support::INSTALLED_AT_SYSTEM_LEVEL); |
| + system_install); |
| } |
| } |