Index: content/renderer/render_view_impl.h |
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h |
index 23b5d936c18d5f155c0f0dba73a1b5cc64c8e603..468b39f86c70a32eb097b366e35a66acbe51200c 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); |