Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / browser / runtime_file_select_helper.h

diff --git a/src/xwalk/runtime/browser/runtime_file_select_helper.h b/src/xwalk/runtime/browser/runtime_file_select_helper.h
index 3c73d1a..f98d908 100644 (file)
--- a/src/xwalk/runtime/browser/runtime_file_select_helper.h
+++ b/src/xwalk/runtime/browser/runtime_file_select_helper.h
@@ -58,9 +58,9 @@ class RuntimeFileSelectHelper
         : parent_(parent),
           id_(id) {}
     virtual ~DirectoryListerDispatchDelegate() {}
-    virtual void OnListFile(
-        const net::DirectoryLister::DirectoryListerData& data) OVERRIDE;
-    virtual void OnListDone(int error) OVERRIDE;
+    void OnListFile(
+        const net::DirectoryLister::DirectoryListerData& data) override;
+    void OnListDone(int error) override;
    private:
     // This RuntimeFileSelectHelper owns this object.
     RuntimeFileSelectHelper* parent_;
@@ -82,23 +82,23 @@ class RuntimeFileSelectHelper
   void RunFileChooserEnd();
 
   // SelectFileDialog::Listener overrides.
-  virtual void FileSelected(
-      const base::FilePath& path, int index, void* params) OVERRIDE;
-  virtual void FileSelectedWithExtraInfo(
+  void FileSelected(
+      const base::FilePath& path, int index, void* params) override;
+  void FileSelectedWithExtraInfo(
       const ui::SelectedFileInfo& file,
       int index,
-      void* params) OVERRIDE;
-  virtual void MultiFilesSelected(const std::vector<base::FilePath>& files,
-                                  void* params) OVERRIDE;
-  virtual void MultiFilesSelectedWithExtraInfo(
+      void* params) override;
+  void MultiFilesSelected(const std::vector<base::FilePath>& files,
+                          void* params) override;
+  void MultiFilesSelectedWithExtraInfo(
       const std::vector<ui::SelectedFileInfo>& files,
-      void* params) OVERRIDE;
-  virtual void FileSelectionCanceled(void* params) OVERRIDE;
+      void* params) override;
+  void FileSelectionCanceled(void* params) override;
 
   // content::NotificationObserver overrides.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
 
   void EnumerateDirectory(int request_id,
                           content::RenderViewHost* render_view_host,
@@ -125,7 +125,8 @@ class RuntimeFileSelectHelper
   // |accept_types| contains only valid lowercased MIME types or file extensions
   // beginning with a period (.).
   static scoped_ptr<ui::SelectFileDialog::FileTypeInfo>
-      GetFileTypesFromAcceptType(const std::vector<base::string16>& accept_types);
+      GetFileTypesFromAcceptType(
+        const std::vector<base::string16>& accept_types);
 
   // Check the accept type is valid. It is expected to be all lower case with
   // no whitespace.