diff options
| author | Scott Graham <scottmg@chromium.org> | 2016-02-17 16:54:41 -0800 |
|---|---|---|
| committer | Scott Graham <scottmg@chromium.org> | 2016-02-18 00:57:10 +0000 |
| commit | efeba3f1d2d789d7169c9783f30f98db489cdad2 (patch) | |
| tree | d50a4d0045ffe23303d34be0f16eace02b08d435 | |
| parent | 0f4b0822aa6bb67ba1cea05a2d67c1512389f234 (diff) | |
| download | chromium_src-efeba3f1d2d789d7169c9783f30f98db489cdad2.zip chromium_src-efeba3f1d2d789d7169c9783f30f98db489cdad2.tar.gz chromium_src-efeba3f1d2d789d7169c9783f30f98db489cdad2.tar.bz2 | |
Focus on the default browser option when opening the Win10 settings page.
BUG=576490
Review URL: https://codereview.chromium.org/1701783002
Cr-Commit-Position: refs/heads/master@{#375692}
(cherry picked from commit 3d06b11789cd40a9ff1d0d83f3bb467beb682c8f)
Review URL: https://codereview.chromium.org/1704203003 .
Cr-Commit-Position: refs/branch-heads/2623@{#436}
Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907}
| -rw-r--r-- | chrome/installer/util/shell_util.cc | 13 | ||||
| -rw-r--r-- | tools/metrics/histograms/histograms.xml | 10 |
2 files changed, 22 insertions, 1 deletions
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc index 19f1f4cb..4934370 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -27,6 +27,7 @@ #include "base/md5.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" +#include "base/metrics/sparse_histogram.h" #include "base/path_service.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" @@ -720,7 +721,17 @@ bool LaunchDefaultAppsSettingsModernDialog() { L"windows.immersivecontrolpanel_cw5n1h2txyewy" L"!microsoft.windows.immersivecontrolpanel", L"page=SettingsPageAppsDefaults", AO_NONE, &pid); - return SUCCEEDED(hr); + if (SUCCEEDED(hr)) { + hr = activator->ActivateApplication( + L"windows.immersivecontrolpanel_cw5n1h2txyewy" + L"!microsoft.windows.immersivecontrolpanel", + L"page=SettingsPageAppsDefaults" + L"&target=SystemSettings_DefaultApps_Browser", AO_NONE, &pid); + } + if (SUCCEEDED(hr)) + return true; + UMA_HISTOGRAM_SPARSE_SLOWLY("DefaultBrowser.ActivateSettings.ErrorHresult", + hr); } return false; } diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml index eab68f8..b68e1d3 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml @@ -6957,6 +6957,15 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries. </summary> </histogram> +<histogram name="DefaultBrowser.ActivateSettings.ErrorHresult" enum="Hresult"> + <owner>pmonette@chromium.org</owner> + <owner>grt@chromium.org</owner> + <summary> + The HRESULT from ActivateApplication when opening the Win10+ settings page + fails. + </summary> +</histogram> + <histogram name="DefaultBrowser.AsyncSetAsDefault.Duration" units="ms"> <obsolete> Deprecated 2015/11. Renamed to DefaultBrowser.SetDefaultAsyncDuration. @@ -67294,6 +67303,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries. <int value="-2147023436" label="ERROR_TIMEOUT"/> <int value="-2147023179" label="RPC_S_UNKNOWN_IF"/> <int value="-2147023174" label="RPC_S_SERVER_UNAVAILABLE"/> + <int value="-2147009295" label="ERROR_INSTALL_PACKAGE_NOT_FOUND"/> <int value="-2146959355" label="CO_E_SERVER_EXEC_FAILURE"/> </enum> |