Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / web_modal / web_contents_modal_dialog_manager.h

diff --git a/src/components/web_modal/web_contents_modal_dialog_manager.h b/src/components/web_modal/web_contents_modal_dialog_manager.h
index 7531301..eb0dd12 100644 (file)
--- a/src/components/web_modal/web_contents_modal_dialog_manager.h
+++ b/src/components/web_modal/web_contents_modal_dialog_manager.h
@@ -23,7 +23,7 @@ class WebContentsModalDialogManager
       public content::WebContentsObserver,
       public content::WebContentsUserData<WebContentsModalDialogManager> {
  public:
-  virtual ~WebContentsModalDialogManager();
+  ~WebContentsModalDialogManager() override;
 
   WebContentsModalDialogManagerDelegate* delegate() const { return delegate_; }
   void SetDelegate(WebContentsModalDialogManagerDelegate* d);
@@ -47,12 +47,11 @@ class WebContentsModalDialogManager
 
   // Focus the topmost modal dialog.  IsDialogActive() must be true when calling
   // this function.
-  void FocusTopmostDialog();
+  void FocusTopmostDialog() const;
 
-  // Overriden from SingleWebContentsDialogManagerDelegate:
-  virtual content::WebContents* GetWebContents() const OVERRIDE;
-  // Called when a WebContentsModalDialogs we own is about to be closed.
-  virtual void WillClose(NativeWebContentsModalDialog dialog) OVERRIDE;
+  // SingleWebContentsDialogManagerDelegate:
+  content::WebContents* GetWebContents() const override;
+  void WillClose(NativeWebContentsModalDialog dialog) override;
 
   // For testing.
   class TestApi {
@@ -74,6 +73,7 @@ class WebContentsModalDialogManager
  private:
   explicit WebContentsModalDialogManager(content::WebContents* web_contents);
   friend class content::WebContentsUserData<WebContentsModalDialogManager>;
+  friend class PopupManager;
 
   struct DialogState {
     DialogState(NativeWebContentsModalDialog dialog,
@@ -99,14 +99,14 @@ class WebContentsModalDialogManager
   void CloseAllDialogs();
 
   // Overridden from content::WebContentsObserver:
-  virtual void DidNavigateMainFrame(
+  void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) OVERRIDE;
-  virtual void DidGetIgnoredUIEvent() OVERRIDE;
-  virtual void WasShown() OVERRIDE;
-  virtual void WasHidden() OVERRIDE;
-  virtual void WebContentsDestroyed() OVERRIDE;
-  virtual void DidAttachInterstitialPage() OVERRIDE;
+      const content::FrameNavigateParams& params) override;
+  void DidGetIgnoredUIEvent() override;
+  void WasShown() override;
+  void WasHidden() override;
+  void WebContentsDestroyed() override;
+  void DidAttachInterstitialPage() override;
 
   // Delegate for notifying our owner about stuff. Not owned by us.
   WebContentsModalDialogManagerDelegate* delegate_;