Merge: Be explicit about target type in platform_util::OpenItem()

chrome/browser/platform_util_win.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/platform_util.h"
 
 #include <commdlg.h>
 #include <dwmapi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_co_mem.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/platform_util_internal.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/utility_process_host.h"
 #include "content/public/browser/utility_process_host_client.h"
 #include "ui/base/win/shell.h"
 #include "ui/gfx/native_widget_types.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 
+namespace platform_util {
+
 namespace {
 
+// TODO(asanka): Move this to ui/base/win/shell.{h,cc} and invoke it from the
+// utility process.
 void ShowItemInFolderOnFileThread(const base::FilePath& full_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   base::FilePath dir = full_path.DirName().AsEndingWithSeparator();
   // ParseDisplayName will fail if the directory is "C:", it must be "C:\\".
   if (dir.empty())
     return;
 
   typedef HRESULT (WINAPI *SHOpenFolderAndSelectItemsFuncPtr)(
       PCIDLIST_ABSOLUTE pidl_Folder,
       UINT cidl,
@@ skipping 48 matching lines @@
   hr = (*open_folder_and_select_itemsPtr)(dir_item, arraysize(highlight),
                                           highlight, NULL);
 
   if (FAILED(hr)) {
     // On some systems, the above call mysteriously fails with "file not
     // found" even though the file is there.  In these cases, ShellExecute()
     // seems to work as a fallback (although it won't select the file).
     if (hr == ERROR_FILE_NOT_FOUND) {
       ShellExecute(NULL, L"open", dir.value().c_str(), NULL, NULL, SW_SHOW);
     } else {
-      LOG(WARNING) << " " << __FUNCTION__
-                   << "(): Can't open full_path = \""
+      LOG(WARNING) << " " << __FUNCTION__ << "(): Can't open full_path = \""
                    << full_path.value() << "\""
-                  << " hr = " << logging::SystemErrorCodeToString(hr);
+                   << " hr = " << logging::SystemErrorCodeToString(hr);
     }
   }
 }
 
 // Old ShellExecute crashes the process when the command for a given scheme
 // is empty. This function tells if it is.
 bool ValidateShellCommandForScheme(const std::string& scheme) {
   base::win::RegKey key;
   base::string16 registry_path = base::ASCIIToUTF16(scheme) +
                                  L"\\shell\\open\\command";
@@ skipping 33 matching lines @@
   if (reinterpret_cast<ULONG_PTR>(ShellExecuteA(NULL, "open",
                                                 escaped_url.c_str(), NULL, NULL,
                                                 SW_SHOWNORMAL)) <= 32) {
     // We fail to execute the call. We could display a message to the user.
     // TODO(nsylvain): we should also add a dialog to warn on errors. See
     // bug 1136923.
     return;
   }
 }
 
-void OpenItemViaShellInUtilityProcess(const base::FilePath& full_path) {
+void OpenItemViaShellInUtilityProcess(const base::FilePath& full_path,
+                                      OpenItemType type) {
   base::WeakPtr<content::UtilityProcessHost> utility_process_host(
       content::UtilityProcessHost::Create(NULL, NULL)->AsWeakPtr());
   utility_process_host->DisableSandbox();
-  utility_process_host->Send(new ChromeUtilityMsg_OpenItemViaShell(full_path));
+  switch (type) {
+    case OPEN_FILE:
+      utility_process_host->Send(
+          new ChromeUtilityMsg_OpenFileViaShell(full_path));
+      return;
+
+    case OPEN_FOLDER:
+      utility_process_host->Send(
+          new ChromeUtilityMsg_OpenFolderViaShell(full_path));
+      return;
+  }
+}
+
+void ActivateDesktopIfNecessary() {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH)
+    chrome::ActivateDesktopHelper(chrome::ASH_KEEP_RUNNING);
 }
 
 }  // namespace
 
-namespace platform_util {
-
 void ShowItemInFolder(Profile* profile, const base::FilePath& full_path) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH)
-    chrome::ActivateDesktopHelper(chrome::ASH_KEEP_RUNNING);
-
+  ActivateDesktopIfNecessary();
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&ShowItemInFolderOnFileThread, full_path));
 }
 
-void OpenItem(Profile* profile, const base::FilePath& full_path) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+namespace internal {
 
-  if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH)
-    chrome::ActivateDesktopHelper(chrome::ASH_KEEP_RUNNING);
+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(
-        BrowserThread::IO,
-        FROM_HERE,
-        base::Bind(&OpenItemViaShellInUtilityProcess, full_path));
+        BrowserThread::IO, FROM_HERE,
+        base::Bind(&OpenItemViaShellInUtilityProcess, path, type));
   } else {
-    BrowserThread::PostTask(
-        BrowserThread::FILE,
-        FROM_HERE,
-        base::Bind(base::IgnoreResult(&ui::win::OpenItemViaShell), full_path));
+    switch (type) {
+      case OPEN_FILE:
+        ui::win::OpenFileViaShell(path);
+        break;
+
+      case OPEN_FOLDER:
+        ui::win::OpenFolderViaShell(path);
+        break;
+    }
   }
 }
 
+}  // namespace internal
+
 void OpenExternal(Profile* profile, const GURL& url) {
   DCHECK(BrowserThread::CurrentlyOn(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));
 }
 
 }  // namespace platform_util