Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / constrained_web_dialog_ui.cc

diff --git a/src/chrome/browser/ui/webui/constrained_web_dialog_ui.cc b/src/chrome/browser/ui/webui/constrained_web_dialog_ui.cc
index c517ae7..30b7cce 100644 (file)
--- a/src/chrome/browser/ui/webui/constrained_web_dialog_ui.cc
+++ b/src/chrome/browser/ui/webui/constrained_web_dialog_ui.cc
@@ -36,7 +36,7 @@ class ConstrainedWebDialogDelegateUserData
  public:
   explicit ConstrainedWebDialogDelegateUserData(
       ConstrainedWebDialogDelegate* delegate) : delegate_(delegate) {}
-  virtual ~ConstrainedWebDialogDelegateUserData() {}
+  ~ConstrainedWebDialogDelegateUserData() override {}
 
   ConstrainedWebDialogDelegate* delegate() { return delegate_; }
 
@@ -60,6 +60,11 @@ ConstrainedWebDialogUI::~ConstrainedWebDialogUI() {
 
 void ConstrainedWebDialogUI::RenderViewCreated(
     RenderViewHost* render_view_host) {
+  // Add a "dialogClose" callback which matches WebDialogUI behavior.
+  web_ui()->RegisterMessageCallback("dialogClose",
+      base::Bind(&ConstrainedWebDialogUI::OnDialogCloseMessage,
+                 base::Unretained(this)));
+
   ConstrainedWebDialogDelegate* delegate = GetConstrainedDelegate();
   if (!delegate)
     return;
@@ -74,11 +79,6 @@ void ConstrainedWebDialogUI::RenderViewCreated(
     web_ui()->AddMessageHandler(*it);
   }
 
-  // Add a "dialogClose" callback which matches WebDialogUI behavior.
-  web_ui()->RegisterMessageCallback("dialogClose",
-      base::Bind(&ConstrainedWebDialogUI::OnDialogCloseMessage,
-                 base::Unretained(this)));
-
   dialog_delegate->OnDialogShown(web_ui(), render_view_host);
 }