summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-21 05:42:00 +0000
committerkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-21 05:42:00 +0000
commit455258051a2cb4591155cd099e959ce593340736 (patch)
tree5d69f116074995489a2bd1889da6edd61b7e4bc1
parent1c321ee57a522e891d91a41a09bd900f0afd6f0d (diff)
downloadchromium_src-455258051a2cb4591155cd099e959ce593340736.zip
chromium_src-455258051a2cb4591155cd099e959ce593340736.tar.gz
chromium_src-455258051a2cb4591155cd099e959ce593340736.tar.bz2
Removing FileUtilities::revealOSInFolder which is not used anymore
BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10391185 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138079 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/renderer_host/file_utilities_message_filter.cc13
-rw-r--r--content/browser/renderer_host/file_utilities_message_filter.h1
-rw-r--r--content/browser/renderer_host/render_process_host_impl.cc1
-rw-r--r--content/common/file_utilities_messages.h3
-rw-r--r--content/renderer/renderer_webkitplatformsupport_impl.cc10
-rw-r--r--webkit/glue/webfileutilities_impl.cc4
-rw-r--r--webkit/glue/webfileutilities_impl.h3
7 files changed, 2 insertions, 33 deletions
diff --git a/content/browser/renderer_host/file_utilities_message_filter.cc b/content/browser/renderer_host/file_utilities_message_filter.cc
index 24dab97..e72916c 100644
--- a/content/browser/renderer_host/file_utilities_message_filter.cc
+++ b/content/browser/renderer_host/file_utilities_message_filter.cc
@@ -7,7 +7,6 @@
#include "base/file_util.h"
#include "content/browser/child_process_security_policy_impl.h"
#include "content/common/file_utilities_messages.h"
-#include "content/public/browser/content_browser_client.h"
using content::BrowserThread;
@@ -21,9 +20,7 @@ FileUtilitiesMessageFilter::~FileUtilitiesMessageFilter() {
void FileUtilitiesMessageFilter::OverrideThreadForMessage(
const IPC::Message& message,
BrowserThread::ID* thread) {
- if (message.type() == FileUtilitiesMsg_RevealFolderInOS::ID)
- *thread = BrowserThread::UI;
- else if (IPC_MESSAGE_CLASS(message) == FileUtilitiesMsgStart)
+ if (IPC_MESSAGE_CLASS(message) == FileUtilitiesMsgStart)
*thread = BrowserThread::FILE;
}
@@ -35,7 +32,6 @@ bool FileUtilitiesMessageFilter::OnMessageReceived(const IPC::Message& message,
IPC_MESSAGE_HANDLER(FileUtilitiesMsg_GetFileModificationTime,
OnGetFileModificationTime)
IPC_MESSAGE_HANDLER(FileUtilitiesMsg_OpenFile, OnOpenFile)
- IPC_MESSAGE_HANDLER(FileUtilitiesMsg_RevealFolderInOS, OnRevealFolderInOS)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
return handled;
@@ -111,10 +107,3 @@ void FileUtilitiesMessageFilter::OnOpenFile(
*result = base::FileDescriptor(file_handle, true);
#endif
}
-
-void FileUtilitiesMessageFilter::OnRevealFolderInOS(const FilePath& path) {
- // Only honor the request if appropriate permissions are granted.
- if (ChildProcessSecurityPolicyImpl::GetInstance()->CanReadFile(process_id_,
- path))
- content::GetContentClient()->browser()->OpenItem(path);
-}
diff --git a/content/browser/renderer_host/file_utilities_message_filter.h b/content/browser/renderer_host/file_utilities_message_filter.h
index 22456ab..b84fd29 100644
--- a/content/browser/renderer_host/file_utilities_message_filter.h
+++ b/content/browser/renderer_host/file_utilities_message_filter.h
@@ -39,7 +39,6 @@ class FileUtilitiesMessageFilter : public content::BrowserMessageFilter {
void OnOpenFile(const FilePath& path,
int mode,
IPC::PlatformFileForTransit* result);
- void OnRevealFolderInOS(const FilePath& path);
// The ID of this process.
int process_id_;
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 8ab8934..22cd22c 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1365,7 +1365,6 @@ void RenderProcessHostImpl::OnUserMetricsRecordAction(
content::RecordComputedAction(action);
}
-
void RenderProcessHostImpl::OnSavedPageAsMHTML(int job_id, int64 data_size) {
MHTMLGenerationManager::GetInstance()->MHTMLGenerated(job_id, data_size);
}
diff --git a/content/common/file_utilities_messages.h b/content/common/file_utilities_messages.h
index af42bd0..642ab8b 100644
--- a/content/common/file_utilities_messages.h
+++ b/content/common/file_utilities_messages.h
@@ -30,6 +30,3 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FileUtilitiesMsg_OpenFile,
FilePath /* path */,
int /* mode */,
IPC::PlatformFileForTransit /* result */)
-
-IPC_MESSAGE_CONTROL1(FileUtilitiesMsg_RevealFolderInOS,
- FilePath /* path */)
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index 9a8926b..f4b7d6e 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -112,7 +112,6 @@ class RendererWebKitPlatformSupportImpl::MimeRegistry
class RendererWebKitPlatformSupportImpl::FileUtilities
: public webkit_glue::WebFileUtilitiesImpl {
public:
- virtual void revealFolderInOS(const WebKit::WebString& path);
virtual bool getFileSize(const WebKit::WebString& path, long long& result);
virtual bool getFileModificationTime(const WebKit::WebString& path,
double& result);
@@ -419,15 +418,6 @@ bool RendererWebKitPlatformSupportImpl::FileUtilities::getFileSize(
return false;
}
-void RendererWebKitPlatformSupportImpl::FileUtilities::revealFolderInOS(
- const WebString& path) {
- FilePath file_path(webkit_glue::WebStringToFilePath(path));
- bool res = file_util::AbsolutePath(&file_path);
- DCHECK(res);
- RenderThreadImpl::current()->Send(
- new FileUtilitiesMsg_RevealFolderInOS(file_path));
-}
-
bool RendererWebKitPlatformSupportImpl::FileUtilities::getFileModificationTime(
const WebString& path,
double& result) {
diff --git a/webkit/glue/webfileutilities_impl.cc b/webkit/glue/webfileutilities_impl.cc
index a1110e6..aefecf2 100644
--- a/webkit/glue/webfileutilities_impl.cc
+++ b/webkit/glue/webfileutilities_impl.cc
@@ -24,10 +24,6 @@ WebFileUtilitiesImpl::WebFileUtilitiesImpl()
WebFileUtilitiesImpl::~WebFileUtilitiesImpl() {
}
-void WebFileUtilitiesImpl::revealFolderInOS(const WebString& path) {
- NOTREACHED();
-}
-
bool WebFileUtilitiesImpl::fileExists(const WebString& path) {
FilePath::StringType file_path = WebStringToFilePathString(path);
return file_util::PathExists(FilePath(file_path));
diff --git a/webkit/glue/webfileutilities_impl.h b/webkit/glue/webfileutilities_impl.h
index e2d24f2..a589f0a 100644
--- a/webkit/glue/webfileutilities_impl.h
+++ b/webkit/glue/webfileutilities_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -18,7 +18,6 @@ class WEBKIT_GLUE_EXPORT WebFileUtilitiesImpl :
virtual ~WebFileUtilitiesImpl();
// WebFileUtilities methods:
- virtual void revealFolderInOS(const WebKit::WebString& path);
virtual bool fileExists(const WebKit::WebString& path);
virtual bool deleteFile(const WebKit::WebString& path);
virtual bool deleteEmptyDirectory(const WebKit::WebString& path);