Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / ui / webui_login_view.h

diff --git a/src/chrome/browser/chromeos/login/ui/webui_login_view.h b/src/chrome/browser/chromeos/login/ui/webui_login_view.h
index b48964d..4673fab 100644 (file)
--- a/src/chrome/browser/chromeos/login/ui/webui_login_view.h
+++ b/src/chrome/browser/chromeos/login/ui/webui_login_view.h
@@ -62,22 +62,22 @@ class WebUILoginView : public views::View,
 
   // Overridden from views::View:
   virtual bool AcceleratorPressed(
-      const ui::Accelerator& accelerator) OVERRIDE;
-  virtual const char* GetClassName() const OVERRIDE;
-  virtual void RequestFocus() OVERRIDE;
+      const ui::Accelerator& accelerator) override;
+  virtual const char* GetClassName() const override;
+  virtual void RequestFocus() override;
 
   // Overridden from ChromeWebModalDialogManagerDelegate:
   virtual web_modal::WebContentsModalDialogHost*
-      GetWebContentsModalDialogHost() OVERRIDE;
+      GetWebContentsModalDialogHost() override;
 
   // Overridden from web_modal::WebContentsModalDialogHost:
-  virtual gfx::NativeView GetHostView() const OVERRIDE;
-  virtual gfx::Point GetDialogPosition(const gfx::Size& size) OVERRIDE;
-  virtual gfx::Size GetMaximumDialogSize() OVERRIDE;
+  virtual gfx::NativeView GetHostView() const override;
+  virtual gfx::Point GetDialogPosition(const gfx::Size& size) override;
+  virtual gfx::Size GetMaximumDialogSize() override;
   virtual void AddObserver(
-      web_modal::ModalDialogHostObserver* observer) OVERRIDE;
+      web_modal::ModalDialogHostObserver* observer) override;
   virtual void RemoveObserver(
-      web_modal::ModalDialogHostObserver* observer) OVERRIDE;
+      web_modal::ModalDialogHostObserver* observer) override;
 
   // Gets the native window from the view widget.
   gfx::NativeWindow GetNativeWindow() const;
@@ -117,15 +117,15 @@ class WebUILoginView : public views::View,
 
  protected:
   // Overridden from views::View:
-  virtual void Layout() OVERRIDE;
-  virtual void OnLocaleChanged() OVERRIDE;
-  virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
-  virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE;
+  virtual void Layout() override;
+  virtual void OnLocaleChanged() override;
+  virtual void ChildPreferredSizeChanged(View* child) override;
+  virtual void AboutToRequestFocusFromTabTraversal(bool reverse) override;
 
   // Overridden from content::NotificationObserver.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // WebView for rendering a webpage as a webui login.
   views::WebView* webui_login_;
@@ -136,31 +136,31 @@ class WebUILoginView : public views::View,
 
   // Overridden from content::WebContentsDelegate.
   virtual bool HandleContextMenu(
-      const content::ContextMenuParams& params) OVERRIDE;
+      const content::ContextMenuParams& params) override;
   virtual void HandleKeyboardEvent(
       content::WebContents* source,
-      const content::NativeWebKeyboardEvent& event) OVERRIDE;
+      const content::NativeWebKeyboardEvent& event) override;
   virtual bool IsPopupOrPanel(
-      const content::WebContents* source) const OVERRIDE;
-  virtual bool TakeFocus(content::WebContents* source, bool reverse) OVERRIDE;
+      const content::WebContents* source) const override;
+  virtual bool TakeFocus(content::WebContents* source, bool reverse) override;
   virtual void RequestMediaAccessPermission(
       content::WebContents* web_contents,
       const content::MediaStreamRequest& request,
-      const content::MediaResponseCallback& callback) OVERRIDE;
+      const content::MediaResponseCallback& callback) override;
   virtual bool CheckMediaAccessPermission(
       content::WebContents* web_contents,
       const GURL& security_origin,
-      content::MediaStreamType type) OVERRIDE;
+      content::MediaStreamType type) override;
   virtual bool PreHandleGestureEvent(
       content::WebContents* source,
-      const blink::WebGestureEvent& event) OVERRIDE;
+      const blink::WebGestureEvent& event) override;
 
   // Overridden from content::WebContentsObserver.
   virtual void DidFailProvisionalLoad(
       content::RenderFrameHost* render_frame_host,
       const GURL& validated_url,
       int error_code,
-      const base::string16& error_description) OVERRIDE;
+      const base::string16& error_description) override;
 
   // Performs series of actions when login prompt is considered
   // to be ready and visible.