diff options
| -rw-r--r-- | chrome/browser/chromeos/cros/mount_library.cc | 10 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_file_browser_private_api.h | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/cros/mount_library.cc b/chrome/browser/chromeos/cros/mount_library.cc index f740b7c..df0b2c0 100644 --- a/chrome/browser/chromeos/cros/mount_library.cc +++ b/chrome/browser/chromeos/cros/mount_library.cc @@ -35,7 +35,8 @@ std::string MountLibrary::MountTypeToString(MountType type) { // static MountType MountLibrary::MountTypeFromString( - const std::string& type_str) { + const std::string& type_str) + OVERRIDE { if (type_str == "device") { return MOUNT_TYPE_DEVICE; } else if (type_str == "network") { @@ -587,6 +588,13 @@ class MountLibraryStubImpl : public MountLibrary { virtual const MountPointMap& mount_points() const OVERRIDE { return mount_points_; } + virtual std::string MountTypeToString(MountType type) const OVERRIDE { + return ""; + } + virtual MountType MountTypeFromString(const std::string& type_str) const + OVERRIDE { + return MOUNT_TYPE_INVALID; + } virtual void RequestMountInfoRefresh() OVERRIDE {} virtual void MountPath(const char* source_path, MountType type, const MountPathOptions& options) OVERRIDE {} diff --git a/chrome/browser/extensions/extension_file_browser_private_api.h b/chrome/browser/extensions/extension_file_browser_private_api.h index 0dfad94..69bd537 100644 --- a/chrome/browser/extensions/extension_file_browser_private_api.h +++ b/chrome/browser/extensions/extension_file_browser_private_api.h @@ -135,7 +135,7 @@ class FileBrowserFunction // Callback with converted local paths. virtual void GetLocalPathsResponseOnUIThread(const FilePathList& files, - void* context) {} + void* context) { NOTREACHED(); } // Figure out the tab_id of the hosting tab. int32 GetTabId() const; @@ -237,7 +237,6 @@ class AddMountFunction MountParamaters(const std::string& type, const chromeos::MountPathOptions& options) : mount_type(type), mount_options(options) {} - ~MountParamaters() {}; std::string mount_type; chromeos::MountPathOptions mount_options; }; |