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

Unified Diff: chrome/browser/platform_util_win.cc

Issue 1581473002: Remove base/win/metro.{cc|h} and some associated code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 4 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
Index: chrome/browser/platform_util_win.cc
diff --git a/chrome/browser/platform_util_win.cc b/chrome/browser/platform_util_win.cc
index 967ad9f3c3a63fa8c6bafa2797625b9b79160b0f..0aad227d9051905aa4bc8312137e3cf77b8a0739 100644
--- a/chrome/browser/platform_util_win.cc
+++ b/chrome/browser/platform_util_win.cc
@@ -188,16 +188,9 @@ void OpenItemViaShellInUtilityProcess(const base::FilePath& full_path,
}
}
-void ActivateDesktopIfNecessary() {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
- if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH)
- chrome::ActivateDesktopHelper(chrome::ASH_KEEP_RUNNING);
-}
-
} // namespace
void ShowItemInFolder(Profile* profile, const base::FilePath& full_path) {
- ActivateDesktopIfNecessary();
BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
base::Bind(&ShowItemInFolderOnFileThread, full_path));
}
@@ -205,9 +198,6 @@ void ShowItemInFolder(Profile* profile, const base::FilePath& full_path) {
namespace internal {
void PlatformOpenVerifiedItem(const base::FilePath& path, OpenItemType type) {
- BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
- base::Bind(&ActivateDesktopIfNecessary));
-
if (base::FieldTrialList::FindFullName("IsolateShellOperations") ==
"Enabled") {
BrowserThread::PostTask(
@@ -231,10 +221,6 @@ void PlatformOpenVerifiedItem(const base::FilePath& path, OpenItemType type) {
void OpenExternal(Profile* profile, const GURL& url) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH &&
- !url.SchemeIsHTTPOrHTTPS())
- chrome::ActivateDesktopHelper(chrome::ASH_KEEP_RUNNING);
-
BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
base::Bind(&OpenExternalOnFileThread, url));
}

Powered by Google App Engine
This is Rietveld 408576698