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

Unified Diff: chrome/browser/platform_util_win.cc

Issue 8457004: platform_util::OpenItem fixes (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: update comments 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
Index: chrome/browser/platform_util_win.cc
===================================================================
--- chrome/browser/platform_util_win.cc (revision 108954)
+++ chrome/browser/platform_util_win.cc (working copy)
@@ -9,6 +9,7 @@
#include <shellapi.h>
#include <shlobj.h>
+#include "base/bind.h"
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/logging.h"
@@ -17,13 +18,17 @@
#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))
@@ -107,8 +112,20 @@
}
}
+} // 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) {

Powered by Google App Engine
This is Rietveld 408576698