Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / options / chromeos / user_image_source.h

diff --git a/src/chrome/browser/ui/webui/options/chromeos/user_image_source.h b/src/chrome/browser/ui/webui/options/chromeos/user_image_source.h
index 5d9b541..0397496 100644 (file)
--- a/src/chrome/browser/ui/webui/options/chromeos/user_image_source.h
+++ b/src/chrome/browser/ui/webui/options/chromeos/user_image_source.h
@@ -27,18 +27,18 @@ class UserImageSource : public content::URLDataSource {
   UserImageSource();
 
   // content::URLDataSource implementation.
-  virtual std::string GetSource() const OVERRIDE;
+  virtual std::string GetSource() const override;
   virtual void StartDataRequest(
       const std::string& path,
       int render_process_id,
       int render_frame_id,
-      const content::URLDataSource::GotDataCallback& callback) OVERRIDE;
-  virtual std::string GetMimeType(const std::string& path) const OVERRIDE;
+      const content::URLDataSource::GotDataCallback& callback) override;
+  virtual std::string GetMimeType(const std::string& path) const override;
 
   // Returns PNG encoded image for user with specified email. If there's
   // no user with such email, returns the first default image.
-  base::RefCountedMemory* GetUserImage(const std::string& email,
-                                       ui::ScaleFactor scale_factor) const;
+  static base::RefCountedMemory* GetUserImage(const std::string& email,
+                                              ui::ScaleFactor scale_factor);
 
  private:
   virtual ~UserImageSource();