Index: content/browser/web_contents/web_contents_impl.h |
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h |
index bd4769aad0ab8aa944e71e92885045510de2a8ec..d05c678e3ee54d0f4ef026db32c3ce3f13160ac1 100644 |
--- a/content/browser/web_contents/web_contents_impl.h |
+++ b/content/browser/web_contents/web_contents_impl.h |
@@ -239,12 +239,13 @@ class CONTENT_EXPORT WebContentsImpl |
virtual InterstitialPage* GetInterstitialPage() const OVERRIDE; |
virtual bool IsSavable() OVERRIDE; |
virtual void OnSavePage() OVERRIDE; |
- virtual bool SavePage(const FilePath& main_file, |
- const FilePath& dir_path, |
+ virtual bool SavePage(const base::FilePath& main_file, |
+ const base::FilePath& dir_path, |
SavePageType save_type) OVERRIDE; |
virtual void GenerateMHTML( |
- const FilePath& file, |
- const base::Callback<void(const FilePath&, int64)>& callback) OVERRIDE; |
+ const base::FilePath& file, |
+ const base::Callback<void(const base::FilePath&, int64)>& callback) |
+ OVERRIDE; |
virtual bool IsActiveEntry(int32 page_id) OVERRIDE; |
virtual const std::string& GetContentsMimeType() const OVERRIDE; |
@@ -542,7 +543,7 @@ class CONTENT_EXPORT WebContentsImpl |
int maximum_percent, |
bool remember); |
void OnSaveURL(const GURL& url, const Referrer& referrer); |
- void OnEnumerateDirectory(int request_id, const FilePath& path); |
+ void OnEnumerateDirectory(int request_id, const base::FilePath& path); |
void OnJSOutOfMemory(); |
void OnRegisterProtocolHandler(const std::string& protocol, |
@@ -561,20 +562,21 @@ class CONTENT_EXPORT WebContentsImpl |
void OnOpenDateTimeDialog(int type, const std::string& value); |
#endif |
- void OnCrashedPlugin(const FilePath& plugin_path, base::ProcessId plugin_pid); |
+ void OnCrashedPlugin(const base::FilePath& plugin_path, |
+ base::ProcessId plugin_pid); |
void OnAppCacheAccessed(const GURL& manifest_url, bool blocked_by_policy); |
void OnOpenColorChooser(int color_chooser_id, SkColor color); |
void OnEndColorChooser(int color_chooser_id); |
void OnSetSelectedColorInColorChooser(int color_chooser_id, SkColor color); |
void OnPepperPluginHung(int plugin_child_id, |
- const FilePath& path, |
+ const base::FilePath& path, |
bool is_hung); |
void OnWebUISend(const GURL& source_url, |
const std::string& name, |
const base::ListValue& args); |
void OnRequestPpapiBrokerPermission(int request_id, |
const GURL& url, |
- const FilePath& plugin_path); |
+ const base::FilePath& plugin_path); |
void OnBrowserPluginAllocateInstanceID(const IPC::Message& message, |
int request_id); |
void OnDidDownloadFavicon(int id, |