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

Unified Diff: chrome/browser/platform_util.cc

Issue 352393002: Be explicit about target type in platform_util::OpenItem() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with trunk Created 5 years, 10 months 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.cc
diff --git a/chrome/browser/platform_util.cc b/chrome/browser/platform_util.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ee619a9b024e47a71ca41e11bc14155e2e1bf389
--- /dev/null
+++ b/chrome/browser/platform_util.cc
@@ -0,0 +1,64 @@
+// Copyright 2015 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/files/file.h"
+#include "base/files/file_util.h"
+#include "base/logging.h"
+#include "chrome/browser/platform_util_internal.h"
+#include "content/public/browser/browser_thread.h"
+
+using content::BrowserThread;
+
+namespace platform_util {
+
+namespace {
+
+bool shell_operations_allowed = true;
+
+void VerifyAndOpenItemOnBlockingThread(const base::FilePath& path,
+ OpenItemType type,
+ const OpenOperationCallback& callback) {
+ base::File target_item(path, base::File::FLAG_OPEN | base::File::FLAG_READ);
+ if (!base::PathExists(path)) {
+ if (!callback.is_null())
+ BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+ base::Bind(callback, OPEN_FAILED_PATH_NOT_FOUND));
+ return;
+ }
+ if (base::DirectoryExists(path) != (type == OPEN_FOLDER)) {
+ if (!callback.is_null())
+ BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+ base::Bind(callback, OPEN_FAILED_INVALID_TYPE));
+ return;
+ }
+
+ if (shell_operations_allowed)
+ internal::PlatformOpenVerifiedItem(path, type);
+ if (!callback.is_null())
+ BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+ base::Bind(callback, OPEN_SUCCEEDED));
+}
+
+} // namespace
+
+namespace internal {
+
+void DisableShellOperationsForTesting() {
+ shell_operations_allowed = false;
+}
+}
mtomasz 2015/03/06 07:05:49 nit: // namespace nit: Add \n in #51 or remove in
asanka 2015/03/06 21:09:40 Done.
+
+void OpenItem(Profile* profile,
+ const base::FilePath& full_path,
+ OpenItemType item_type,
+ const OpenOperationCallback& callback) {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ BrowserThread::PostBlockingPoolTask(
+ FROM_HERE, base::Bind(&VerifyAndOpenItemOnBlockingThread, full_path,
+ item_type, callback));
+}
+
+} // namespace platform_util

Powered by Google App Engine
This is Rietveld 408576698