summaryrefslogtreecommitdiffstats
path: root/content/renderer
diff options
context:
space:
mode:
Diffstat (limited to 'content/renderer')
-rw-r--r--content/renderer/gpu/gpu_benchmarking_extension.cc8
-rw-r--r--content/renderer/hyphenator/hyphenator_unittest.cc4
-rw-r--r--content/renderer/pepper/pepper_file_chooser_host.cc4
-rw-r--r--content/renderer/pepper/pepper_file_chooser_host_unittest.cc4
-rw-r--r--content/renderer/pepper/pepper_file_io_host.cc2
-rw-r--r--content/renderer/pepper/pepper_hung_plugin_filter.cc7
-rw-r--r--content/renderer/pepper/pepper_hung_plugin_filter.h4
-rw-r--r--content/renderer/pepper/pepper_plugin_delegate_impl.cc16
-rw-r--r--content/renderer/pepper/renderer_ppapi_host_impl.cc2
-rw-r--r--content/renderer/render_thread_impl.cc2
-rw-r--r--content/renderer/render_view_impl.cc12
-rw-r--r--content/renderer/render_view_impl.h14
-rw-r--r--content/renderer/renderer_main_platform_delegate_linux.cc2
-rw-r--r--content/renderer/renderer_webkitplatformsupport_impl.cc4
14 files changed, 44 insertions, 41 deletions
diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc
index f350151..7fa3823 100644
--- a/content/renderer/gpu/gpu_benchmarking_extension.cc
+++ b/content/renderer/gpu/gpu_benchmarking_extension.cc
@@ -49,7 +49,7 @@ void InitSkGraphics() {
class SkPictureRecorder : public WebViewBenchmarkSupport::PaintClient {
public:
- explicit SkPictureRecorder(const FilePath& dirpath)
+ explicit SkPictureRecorder(const base::FilePath& dirpath)
: dirpath_(dirpath),
layer_id_(0) {
// Let skia register known effect subclasses. This basically enables
@@ -77,7 +77,7 @@ class SkPictureRecorder : public WebViewBenchmarkSupport::PaintClient {
}
private:
- FilePath dirpath_;
+ base::FilePath dirpath_;
int layer_id_;
SkPicture picture_;
};
@@ -220,8 +220,8 @@ class GpuBenchmarkingWrapper : public v8::Extension {
if (!benchmark_support)
return v8::Undefined();
- FilePath dirpath(FilePath::StringType(*dirname,
- *dirname + dirname.length()));
+ base::FilePath dirpath(
+ base::FilePath::StringType(*dirname, *dirname + dirname.length()));
if (!file_util::CreateDirectory(dirpath) ||
!file_util::PathIsWritable(dirpath)) {
std::string msg("Path is not writable: ");
diff --git a/content/renderer/hyphenator/hyphenator_unittest.cc b/content/renderer/hyphenator/hyphenator_unittest.cc
index b849929..2d41503 100644
--- a/content/renderer/hyphenator/hyphenator_unittest.cc
+++ b/content/renderer/hyphenator/hyphenator_unittest.cc
@@ -44,7 +44,7 @@ class MockListener : public IPC::Listener {
// Open the default dictionary and call the OnControllMessageReceived
// function with a HyphenatorMsg_SetDictionary message.
- FilePath dictionary_path;
+ base::FilePath dictionary_path;
if (!PathService::Get(base::DIR_SOURCE_ROOT, &dictionary_path))
return false;
dictionary_path = dictionary_path.AppendASCII("third_party");
@@ -84,7 +84,7 @@ class HyphenatorTest : public testing::Test {
}
bool Initialize() {
- FilePath dictionary_path;
+ base::FilePath dictionary_path;
if (!PathService::Get(base::DIR_SOURCE_ROOT, &dictionary_path))
return false;
dictionary_path = dictionary_path.AppendASCII("third_party");
diff --git a/content/renderer/pepper/pepper_file_chooser_host.cc b/content/renderer/pepper/pepper_file_chooser_host.cc
index 322603a..98edda5 100644
--- a/content/renderer/pepper/pepper_file_chooser_host.cc
+++ b/content/renderer/pepper/pepper_file_chooser_host.cc
@@ -101,9 +101,9 @@ void PepperFileChooserHost::StoreChosenFiles(
std::vector<ppapi::PPB_FileRef_CreateInfo> chosen_files;
for (size_t i = 0; i < files.size(); i++) {
#if defined(OS_WIN)
- FilePath file_path(UTF8ToWide(files[i].path));
+ base::FilePath file_path(UTF8ToWide(files[i].path));
#else
- FilePath file_path(files[i].path);
+ base::FilePath file_path(files[i].path);
#endif
webkit::ppapi::PPB_FileRef_Impl* ref =
diff --git a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
index 556f130..f49ab533 100644
--- a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
+++ b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
@@ -61,7 +61,7 @@ class PepperFileChooserHostTest : public RenderViewTest {
};
// For testing to convert our hardcoded file paths to 8-bit.
-std::string FilePathToUTF8(const FilePath::StringType& path) {
+std::string FilePathToUTF8(const base::FilePath::StringType& path) {
#if defined(OS_WIN)
return UTF16ToUTF8(path);
#else
@@ -107,7 +107,7 @@ TEST_F(PepperFileChooserHostTest, Show) {
// path separator so we include both a Unix and a Windows one.
ui::SelectedFileInfo selected_info;
selected_info.display_name = FILE_PATH_LITERAL("Hello, world");
- selected_info.local_path = FilePath(FILE_PATH_LITERAL("myp\\ath/foo"));
+ selected_info.local_path = base::FilePath(FILE_PATH_LITERAL("myp\\ath/foo"));
std::vector<ui::SelectedFileInfo> selected_info_vector;
selected_info_vector.push_back(selected_info);
RenderViewImpl* view_impl = static_cast<RenderViewImpl*>(view_);
diff --git a/content/renderer/pepper/pepper_file_io_host.cc b/content/renderer/pepper/pepper_file_io_host.cc
index e6e2b52..d0fb617 100644
--- a/content/renderer/pepper/pepper_file_io_host.cc
+++ b/content/renderer/pepper/pepper_file_io_host.cc
@@ -57,7 +57,7 @@ class PlatformGeneralCallbackTranslator
}
virtual void DidReadMetadata(const base::PlatformFileInfo& file_info,
- const FilePath& platform_path) OVERRIDE {
+ const base::FilePath& platform_path) OVERRIDE {
NOTREACHED();
}
diff --git a/content/renderer/pepper/pepper_hung_plugin_filter.cc b/content/renderer/pepper/pepper_hung_plugin_filter.cc
index 7d0574d..26632af 100644
--- a/content/renderer/pepper/pepper_hung_plugin_filter.cc
+++ b/content/renderer/pepper/pepper_hung_plugin_filter.cc
@@ -23,9 +23,10 @@ const int kBlockedHardThresholdSec = kHungThresholdSec * 1.5;
} // namespace
-PepperHungPluginFilter::PepperHungPluginFilter(const FilePath& plugin_path,
- int view_routing_id,
- int plugin_child_id)
+PepperHungPluginFilter::PepperHungPluginFilter(
+ const base::FilePath& plugin_path,
+ int view_routing_id,
+ int plugin_child_id)
: plugin_path_(plugin_path),
view_routing_id_(view_routing_id),
plugin_child_id_(plugin_child_id),
diff --git a/content/renderer/pepper/pepper_hung_plugin_filter.h b/content/renderer/pepper/pepper_hung_plugin_filter.h
index 35fc45e..20b8ae5 100644
--- a/content/renderer/pepper/pepper_hung_plugin_filter.h
+++ b/content/renderer/pepper/pepper_hung_plugin_filter.h
@@ -34,7 +34,7 @@ class PepperHungPluginFilter
// send messages to the browser via that view's route. The |plugin_child_id|
// is the ID in the browser process of the pepper plugin process host. We use
// this to identify the proper plugin process to terminate.
- PepperHungPluginFilter(const FilePath& plugin_path,
+ PepperHungPluginFilter(const base::FilePath& plugin_path,
int view_routing_id,
int plugin_child_id);
@@ -74,7 +74,7 @@ class PepperHungPluginFilter
base::Lock lock_;
- FilePath plugin_path_;
+ base::FilePath plugin_path_;
int view_routing_id_;
int plugin_child_id_;
diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
index f383290..895681f 100644
--- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
@@ -271,7 +271,7 @@ class AsyncOpenFileSystemURLCallbackTranslator
}
virtual void DidReadMetadata(
const base::PlatformFileInfo& file_info,
- const FilePath& platform_path) OVERRIDE {
+ const base::FilePath& platform_path) OVERRIDE {
NOTREACHED();
}
virtual void DidCreateSnapshotFile(
@@ -377,7 +377,7 @@ PepperPluginDelegateImpl::CreatePepperPluginModule(
*pepper_plugin_was_registered = true;
// See if a module has already been loaded for this plugin.
- FilePath path(webplugin_info.path);
+ base::FilePath path(webplugin_info.path);
scoped_refptr<webkit::ppapi::PluginModule> module =
PepperPluginRegistry::GetInstance()->GetLiveModule(path);
if (module) {
@@ -439,7 +439,7 @@ PepperPluginDelegateImpl::CreatePepperPluginModule(
RendererPpapiHost* PepperPluginDelegateImpl::CreateExternalPluginModule(
scoped_refptr<webkit::ppapi::PluginModule> module,
- const FilePath& path,
+ const base::FilePath& path,
ppapi::PpapiPermissions permissions,
const IPC::ChannelHandle& channel_handle,
base::ProcessId peer_pid,
@@ -461,7 +461,7 @@ scoped_refptr<PepperBrokerImpl> PepperPluginDelegateImpl::CreateBroker(
DCHECK(!plugin_module->GetBroker());
// The broker path is the same as the plugin.
- const FilePath& broker_path = plugin_module->path();
+ const base::FilePath& broker_path = plugin_module->path();
scoped_refptr<PepperBrokerImpl> broker =
new PepperBrokerImpl(plugin_module, this);
@@ -484,7 +484,7 @@ scoped_refptr<PepperBrokerImpl> PepperPluginDelegateImpl::CreateBroker(
RendererPpapiHost* PepperPluginDelegateImpl::CreateOutOfProcessModule(
webkit::ppapi::PluginModule* module,
- const FilePath& path,
+ const base::FilePath& path,
ppapi::PpapiPermissions permissions,
const IPC::ChannelHandle& channel_handle,
base::ProcessId peer_pid,
@@ -803,7 +803,7 @@ SkBitmap* PepperPluginDelegateImpl::GetSadPluginBitmap() {
}
WebKit::WebPlugin* PepperPluginDelegateImpl::CreatePluginReplacement(
- const FilePath& file_path) {
+ const base::FilePath& file_path) {
return GetContentClient()->renderer()->CreatePluginReplacement(
render_view_, file_path);
}
@@ -958,7 +958,7 @@ void PepperPluginDelegateImpl::OnPpapiBrokerPermissionResult(
}
bool PepperPluginDelegateImpl::AsyncOpenFile(
- const FilePath& path,
+ const base::FilePath& path,
int flags,
const AsyncOpenFileCallback& callback) {
int message_id = pending_async_open_files_.Add(
@@ -1117,7 +1117,7 @@ bool PepperPluginDelegateImpl::AsyncOpenFileSystemURL(
}
void PepperPluginDelegateImpl::SyncGetFileSystemPlatformPath(
- const GURL& url, FilePath* platform_path) {
+ const GURL& url, base::FilePath* platform_path) {
RenderThreadImpl::current()->Send(new FileSystemHostMsg_SyncGetPlatformPath(
url, platform_path));
}
diff --git a/content/renderer/pepper/renderer_ppapi_host_impl.cc b/content/renderer/pepper/renderer_ppapi_host_impl.cc
index fdc2459..2e9bdb8b 100644
--- a/content/renderer/pepper/renderer_ppapi_host_impl.cc
+++ b/content/renderer/pepper/renderer_ppapi_host_impl.cc
@@ -33,7 +33,7 @@ CONTENT_EXPORT RendererPpapiHost*
RendererPpapiHost::CreateExternalPluginModule(
scoped_refptr<PluginModule> plugin_module,
PluginInstance* plugin_instance,
- const FilePath& file_path,
+ const base::FilePath& file_path,
ppapi::PpapiPermissions permissions,
const IPC::ChannelHandle& channel_handle,
base::ProcessId plugin_pid,
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 7ee9da4..145313b 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -365,7 +365,7 @@ void RenderThreadImpl::Init() {
// Note that under Linux, the media library will normally already have
// been initialized by the Zygote before this instance became a Renderer.
- FilePath media_path;
+ base::FilePath media_path;
PathService::Get(DIR_MEDIA_LIBS, &media_path);
if (!media_path.empty())
media::InitializeMediaLibrary(media_path);
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index f060f156..8d12163 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -915,7 +915,7 @@ WebKit::WebView* RenderViewImpl::webview() const {
return static_cast<WebKit::WebView*>(webwidget());
}
-void RenderViewImpl::PluginCrashed(const FilePath& plugin_path,
+void RenderViewImpl::PluginCrashed(const base::FilePath& plugin_path,
base::ProcessId plugin_pid) {
Send(new ViewHostMsg_CrashedPlugin(routing_id_, plugin_path, plugin_pid));
}
@@ -4632,7 +4632,7 @@ void RenderViewImpl::LoadURLExternally(
// webkit_glue::WebPluginPageDelegate ------------------------------------------
webkit::npapi::WebPluginDelegate* RenderViewImpl::CreatePluginDelegate(
- const FilePath& file_path,
+ const base::FilePath& file_path,
const std::string& mime_type) {
if (!PluginChannelHost::IsListening()) {
LOG(ERROR) << "PluginChannelHost isn't listening";
@@ -4654,7 +4654,7 @@ webkit::npapi::WebPluginDelegate* RenderViewImpl::CreatePluginDelegate(
}
WebKit::WebPlugin* RenderViewImpl::CreatePluginReplacement(
- const FilePath& file_path) {
+ const base::FilePath& file_path) {
return GetContentClient()->renderer()->CreatePluginReplacement(
this, file_path);
}
@@ -5346,7 +5346,7 @@ void RenderViewImpl::OnCustomContextMenuAction(
void RenderViewImpl::OnEnumerateDirectoryResponse(
int id,
- const std::vector<FilePath>& paths) {
+ const std::vector<base::FilePath>& paths) {
if (!enumeration_completions_[id])
return;
@@ -5529,8 +5529,8 @@ void RenderViewImpl::OnGetAllSavableResourceLinksForCurrentPage(
void RenderViewImpl::OnGetSerializedHtmlDataForCurrentPageWithLocalLinks(
const std::vector<GURL>& links,
- const std::vector<FilePath>& local_paths,
- const FilePath& local_directory_name) {
+ const std::vector<base::FilePath>& local_paths,
+ const base::FilePath& local_directory_name) {
// Convert std::vector of GURLs to WebVector<WebURL>
WebVector<WebURL> weburl_links(links);
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 23b5d93..468b39f 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -298,7 +298,8 @@ class CONTENT_EXPORT RenderViewImpl
// (See also WebPluginPageDelegate implementation.)
// Notification that the given plugin has crashed.
- void PluginCrashed(const FilePath& plugin_path, base::ProcessId plugin_pid);
+ void PluginCrashed(const base::FilePath& plugin_path,
+ base::ProcessId plugin_pid);
// Creates a fullscreen container for a pepper plugin instance.
RenderWidgetFullscreenPepper* CreatePepperFullscreenContainer(
@@ -735,10 +736,10 @@ class CONTENT_EXPORT RenderViewImpl
// webkit_glue::WebPluginPageDelegate implementation -------------------------
virtual webkit::npapi::WebPluginDelegate* CreatePluginDelegate(
- const FilePath& file_path,
+ const base::FilePath& file_path,
const std::string& mime_type) OVERRIDE;
virtual WebKit::WebPlugin* CreatePluginReplacement(
- const FilePath& file_path) OVERRIDE;
+ const base::FilePath& file_path) OVERRIDE;
virtual void CreatedPluginWindow(gfx::PluginWindowHandle handle) OVERRIDE;
virtual void WillDestroyPluginWindow(gfx::PluginWindowHandle handle) OVERRIDE;
virtual void DidMovePlugin(
@@ -951,7 +952,8 @@ class CONTENT_EXPORT RenderViewImpl
void OnEnablePreferredSizeChangedMode();
void OnEnableAutoResize(const gfx::Size& min_size, const gfx::Size& max_size);
void OnDisableAutoResize(const gfx::Size& new_size);
- void OnEnumerateDirectoryResponse(int id, const std::vector<FilePath>& paths);
+ void OnEnumerateDirectoryResponse(int id,
+ const std::vector<base::FilePath>& paths);
void OnExecuteEditCommand(const std::string& name, const std::string& value);
void OnExtendSelectionAndDelete(int before, int after);
void OnFileChooserResponse(
@@ -960,8 +962,8 @@ class CONTENT_EXPORT RenderViewImpl
void OnGetAllSavableResourceLinksForCurrentPage(const GURL& page_url);
void OnGetSerializedHtmlDataForCurrentPageWithLocalLinks(
const std::vector<GURL>& links,
- const std::vector<FilePath>& local_paths,
- const FilePath& local_directory_name);
+ const std::vector<base::FilePath>& local_paths,
+ const base::FilePath& local_directory_name);
void OnMediaPlayerActionAt(const gfx::Point& location,
const WebKit::WebMediaPlayerAction& action);
diff --git a/content/renderer/renderer_main_platform_delegate_linux.cc b/content/renderer/renderer_main_platform_delegate_linux.cc
index c0b0172..a653bfe 100644
--- a/content/renderer/renderer_main_platform_delegate_linux.cc
+++ b/content/renderer/renderer_main_platform_delegate_linux.cc
@@ -68,7 +68,7 @@ void RendererMainPlatformDelegate::RunSandboxTests(bool no_sandbox) {
// Under the setuid sandbox, we should not be able to open any file via the
// filesystem.
if (linux_sandbox->GetStatus() & kSandboxLinuxSUID) {
- CHECK(!file_util::PathExists(FilePath("/proc/cpuinfo")));
+ CHECK(!file_util::PathExists(base::FilePath("/proc/cpuinfo")));
}
#if defined(__x86_64__)
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index 99c336a..5c3263a 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -373,7 +373,7 @@ WebString RendererWebKitPlatformSupportImpl::MimeRegistry::mimeTypeFromFile(
// these calls over to the browser process.
std::string mime_type;
RenderThread::Get()->Send(new MimeRegistryMsg_GetMimeTypeFromFile(
- FilePath(webkit_base::WebStringToFilePathString(file_path)),
+ base::FilePath(webkit_base::WebStringToFilePathString(file_path)),
&mime_type));
return ASCIIToUTF16(mime_type);
}
@@ -386,7 +386,7 @@ RendererWebKitPlatformSupportImpl::MimeRegistry::preferredExtensionForMIMEType(
// The sandbox restricts our access to the registry, so we need to proxy
// these calls over to the browser process.
- FilePath::StringType file_extension;
+ base::FilePath::StringType file_extension;
RenderThread::Get()->Send(
new MimeRegistryMsg_GetPreferredExtensionForMimeType(
UTF16ToASCII(mime_type), &file_extension));
generated by cgit v1.1 at 2025-03-24 22:01:43 +0000