diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 00:20:15 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 00:20:15 +0000 |
| commit | d6768ceefd5b4861b61632679225e89d48747d80 (patch) | |
| tree | cd9d753b68c966640ea5c61fd81c6dc4a47dcd81 | |
| parent | 7ee449da270ad66a4ed7e5348cadec9f47f5c91b (diff) | |
| download | chromium_src-d6768ceefd5b4861b61632679225e89d48747d80.zip chromium_src-d6768ceefd5b4861b61632679225e89d48747d80.tar.gz chromium_src-d6768ceefd5b4861b61632679225e89d48747d80.tar.bz2 | |
Ensure that we don't attempt to switch to desktop mode from Chrome ASH on Windows for external http/https url navigations from
Chrome.
The current behavior is that there is a flash due to a switch to desktop and then back to metro for external http/https url
navigations.
BUG=328308
R=sky@chromium.org
Review URL: https://codereview.chromium.org/106953004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241991 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/platform_util_win.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/platform_util_win.cc b/chrome/browser/platform_util_win.cc index 567fa15..976e267 100644 --- a/chrome/browser/platform_util_win.cc +++ b/chrome/browser/platform_util_win.cc @@ -190,7 +190,8 @@ void OpenItem(Profile* profile, const base::FilePath& full_path) { void OpenExternal(Profile* profile, const GURL& url) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) + if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH && + !url.SchemeIsHTTPOrHTTPS()) chrome::ActivateDesktopHelper(chrome::ASH_KEEP_RUNNING); BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, |