platform_util::OpenItem fixes

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/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_co_mem.h"
 #include "base/win/scoped_comptr.h"
+#include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/win/shell.h"
 #include "ui/gfx/native_widget_types.h"
 
-namespace platform_util {
+using content::BrowserThread;
 
-void ShowItemInFolder(const FilePath& full_path) {
+namespace {
+
+void ShowItemInFolderOnFileThread(const FilePath& full_path) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   FilePath dir = full_path.DirName();
   // ParseDisplayName will fail if the directory is "C:", it must be "C:\\".
   if (dir.value() == L"" || !file_util::EnsureEndsWithSeparator(&dir))
     return;
 
   typedef HRESULT (WINAPI *SHOpenFolderAndSelectItemsFuncPtr)(
       PCIDLIST_ABSOLUTE pidl_Folder,
       UINT cidl,
       PCUITEMID_CHILD_ARRAY pidls,
       DWORD flags);
@@ skipping 63 matching lines @@
                    << "(): Can't open full_path = \""
                    << full_path.value() << "\""
                    << " hr = " << hr
                    << " " << reinterpret_cast<LPTSTR>(&message);
       if (message)
         LocalFree(message);
     }
   }
 }
 
+}  // namespace
+
+namespace platform_util {
+
+void ShowItemInFolder(const FilePath& full_path) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
+      base::Bind(&ShowItemInFolderOnFileThread, full_path));
+}
+
 void OpenItem(const FilePath& full_path) {
-  ui::win::OpenItemViaShell(full_path);
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
+      base::Bind(&ui::win::OpenItemViaShell, full_path));
 }
 
 void OpenExternal(const GURL& url) {
   // Quote the input scheme to be sure that the command does not have
   // parameters unexpected by the external program. This url should already
   // have been escaped.
   std::string escaped_url = url.spec();
   escaped_url.insert(0, "\"");
   escaped_url += "\"";
 
@@ skipping 48 matching lines @@
 void ActivateWindow(gfx::NativeWindow window) {
   ::SetForegroundWindow(window);
 }
 
 bool IsVisible(gfx::NativeView view) {
   // MSVC complains if we don't include != 0.
   return ::IsWindowVisible(view) != 0;
 }
 
 }  // namespace platform_util