platform_util::OpenItem fixes

chrome/browser/platform_util_chromeos.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 "base/bind.h"
 #include "base/file_util.h"
 #include "base/process_util.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/file_manager_util.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "content/common/process_watcher.h"
 #include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 
 using content::BrowserThread;
 
 class Profile;
 
+namespace {
+
+void OpenItemOnFileThread(const FilePath& full_path) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  base::Closure callback;
+  if (file_util::DirectoryExists(full_path))
+    callback = base::Bind(&FileManagerUtil::ViewFolder, full_path);
+  else
+    callback = base::Bind(&FileManagerUtil::ViewItem, full_path, false);
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback);
+}
+
+}  // namespace
+
 namespace platform_util {
 
 static const std::string kGmailComposeUrl =
     "https://mail.google.com/mail/?extsrc=mailto&url=";
 
 // Opens file browser on UI thread.
 static
 void OpenFileBrowserOnUIThread(const FilePath& dir) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   Browser* browser = BrowserList::GetLastActive();
   if (!browser)
     return;
 
   FilePath virtual_path;
   if (!FileManagerUtil::ConvertFileToRelativeFileSystemPath(browser->profile(),
                                                             dir,
                                                             &virtual_path)) {
     return;
   }
 
   GURL url = FileManagerUtil::GetFileBrowserUrlWithParams(
      SelectFileDialog::SELECT_NONE, string16(), virtual_path, NULL, 0,
      FilePath::StringType());
   browser->ShowSingletonTab(url);
 }
 
 void ShowItemInFolder(const FilePath& full_path) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   FilePath dir = full_path.DirName();
   if (!file_util::DirectoryExists(dir))
     return;
 
   if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     OpenFileBrowserOnUIThread(dir);
   } else {
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE,
-        NewRunnableFunction(&OpenFileBrowserOnUIThread, dir));
+    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+                            base::Bind(&OpenFileBrowserOnUIThread, dir));
   }
 }
 
 void OpenItem(const FilePath& full_path) {
-  FileManagerUtil::ViewItem(full_path, false);
+  if (BrowserThread::CurrentlyOn(BrowserThread::FILE))
+    OpenItemOnFileThread(full_path);
+  else
+    BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
+                            base::Bind(&OpenItemOnFileThread, full_path));

[asanka, 2011/11/08 15:29:29]

Would it make sense to have an OpenItemOnUIThread() instead and post a task
there if the call isn't already on the UI thread?  That will cut down on thread
hopping since FMU::ViewFolder and FMU::ViewItem want to be on the UI thread.

OpenItem() is currently called from the UI thread.

[achuithb, 2011/11/08 20:49:57]

file_util::DirectoryExists needs to be called on the FILE thread, so we have to
make 1 trip to the file thread before deciding to call FMU::ViewFolder or
FMU::ViewItem on the UI thread.

Am I missing something?

[asanka, 2011/11/08 20:59:33]

You're correct. Sorry.

 }
 
 static void OpenURL(const std::string& url) {
   Browser* browser = BrowserList::GetLastActive();
   browser->AddSelectedTabWithURL(GURL(url), content::PAGE_TRANSITION_LINK);
 }
 
 void OpenExternal(const GURL& url) {
   if (url.SchemeIs("mailto")) {
     std::string string_url = kGmailComposeUrl;
     string_url.append(url.spec());
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE, NewRunnableFunction(OpenURL, string_url));
+    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+                            base::Bind(OpenURL, string_url));
   }
 }
 
 }  // namespace platform_util