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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 8457004: platform_util::OpenItem fixes (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: rebase Created 9 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/file_browser_event_router.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
===================================================================
--- chrome/browser/chrome_content_browser_client.cc (revision 109689)
+++ chrome/browser/chrome_content_browser_client.cc (working copy)
@@ -4,6 +4,9 @@
#include "chrome/browser/chrome_content_browser_client.h"
+#include <set>
+#include <vector>
+
#include "base/bind.h"
#include "base/command_line.h"
#include "chrome/app/breakpad_mac.h"
@@ -644,7 +647,7 @@
}
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
@@ -738,26 +741,11 @@
}
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,
- base::Bind(&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,
- base::Bind(&platform_util::ShowItemInFolder, path));
-#endif
}
void ChromeContentBrowserClient::AllowCertificateError(
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/file_browser_event_router.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698