platform_util::OpenItem fixes

chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.h"
 
+#include <set>
+#include <vector>
+
 #include "base/command_line.h"
 #include "chrome/app/breakpad_mac.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data_remover.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/chrome_benchmarking_message_filter.h"
 #include "chrome/browser/chrome_plugin_message_filter.h"
 #include "chrome/browser/chrome_quota_permission_context.h"
 #include "chrome/browser/chrome_worker_message_filter.h"
@@ skipping 553 matching lines @@
 std::string ChromeContentBrowserClient::GetApplicationLocale() {
   return g_browser_process->GetApplicationLocale();
 }
 
 std::string ChromeContentBrowserClient::GetAcceptLangs(const TabContents* tab) {
   Profile* profile = Profile::FromBrowserContext(tab->browser_context());
   return profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
 }
 
 SkBitmap* ChromeContentBrowserClient::GetDefaultFavicon() {
-  ResourceBundle &rb = ResourceBundle::GetSharedInstance();
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 #if defined(TOUCH_UI)
   // In touch builds, we want large default favicons for the tabstrip, but in
   // other places (such as bookmark, manage search engines, homepage) we assume
   // default favicons are 16x16.
   return rb.GetBitmapNamed(IDR_DEFAULT_LARGE_FAVICON);
 #else
   return rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
 #endif
 }
 
@@ skipping 76 matching lines @@
 
   return NULL;
 }
 
 QuotaPermissionContext*
 ChromeContentBrowserClient::CreateQuotaPermissionContext() {
   return new ChromeQuotaPermissionContext();
 }
 
 void ChromeContentBrowserClient::OpenItem(const FilePath& path) {
-  // On Mac, this call needs to be done on the UI thread.  On other platforms,
-  // do it on the FILE thread so we don't slow down UI.
-#if defined(OS_MACOSX)
   platform_util::OpenItem(path);
-#else
-  BrowserThread::PostTask(
-      BrowserThread::FILE, FROM_HERE,
-      NewRunnableFunction(&platform_util::OpenItem, path));
-#endif
 }
 
 void ChromeContentBrowserClient::ShowItemInFolder(const FilePath& path) {
-#if defined(OS_MACOSX)
-  // Mac needs to run this operation on the UI thread.
   platform_util::ShowItemInFolder(path);
-#else
-  BrowserThread::PostTask(
-      BrowserThread::FILE, FROM_HERE,
-      NewRunnableFunction(&platform_util::ShowItemInFolder, path));
-#endif
 }
 
 void ChromeContentBrowserClient::AllowCertificateError(
     SSLCertErrorHandler* handler,
     bool overridable,
     const base::Callback<void(SSLCertErrorHandler*, bool)>& callback) {
   // If the tab is being prerendered, cancel the prerender and the request.
   TabContents* tab = tab_util::GetTabContentsByID(
       handler->render_process_host_id(),
       handler->tab_contents_id());
@@ skipping 290 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome