Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ui / views / controls / webview / web_dialog_view.h

diff --git a/src/ui/views/controls/webview/web_dialog_view.h b/src/ui/views/controls/webview/web_dialog_view.h
index bb2eb39..613439a 100644 (file)
--- a/src/ui/views/controls/webview/web_dialog_view.h
+++ b/src/ui/views/controls/webview/web_dialog_view.h
@@ -63,7 +63,7 @@ class WEBVIEW_EXPORT WebDialogView : public views::ClientView,
   // Overridden from views::WidgetDelegate:
   virtual bool CanResize() const OVERRIDE;
   virtual ui::ModalType GetModalType() const OVERRIDE;
-  virtual string16 GetWindowTitle() const OVERRIDE;
+  virtual base::string16 GetWindowTitle() const OVERRIDE;
   virtual std::string GetWindowName() const OVERRIDE;
   virtual void WindowClosing() OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
@@ -75,7 +75,7 @@ class WEBVIEW_EXPORT WebDialogView : public views::ClientView,
 
   // Overridden from ui::WebDialogDelegate:
   virtual ui::ModalType GetDialogModalType() const OVERRIDE;
-  virtual string16 GetDialogTitle() const OVERRIDE;
+  virtual base::string16 GetDialogTitle() const OVERRIDE;
   virtual GURL GetDialogContentURL() const OVERRIDE;
   virtual void GetWebUIMessageHandlers(
       std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE;
@@ -110,7 +110,8 @@ class WEBVIEW_EXPORT WebDialogView : public views::ClientView,
                               const gfx::Rect& initial_pos,
                               bool user_gesture,
                               bool* was_blocked) OVERRIDE;
-  virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE;
+  virtual void LoadingStateChanged(content::WebContents* source,
+                                   bool to_different_document) OVERRIDE;
   virtual void BeforeUnloadFired(content::WebContents* tab,
                                  bool proceed,
                                  bool* proceed_to_fire_unload) OVERRIDE;
@@ -121,11 +122,6 @@ class WEBVIEW_EXPORT WebDialogView : public views::ClientView,
   // Initializes the contents of the dialog.
   void InitDialog();
 
-  // Whether the view is initialized. That is, dialog accelerators is registered
-  // and FreezeUpdates property is set to prevent WM from showing the window
-  // until the property is removed.
-  bool initialized_;
-
   // This view is a delegate to the HTML content since it needs to get notified
   // about when the dialog is closing. For all other actions (besides dialog
   // closing) we delegate to the creator of this view, which we keep track of
@@ -142,11 +138,11 @@ class WEBVIEW_EXPORT WebDialogView : public views::ClientView,
   // beforeunload event.
   bool before_unload_fired_;
 
-  // Whether the dialog is closed from WebUI in response to a "DialogClose"
+  // Whether the dialog is closed from WebUI in response to a "dialogClose"
   // message.
   bool closed_via_webui_;
 
-  // A json string returned to WebUI from a "DialogClosed" message.
+  // A json string returned to WebUI from a "dialogClose" message.
   std::string dialog_close_retval_;
 
   // Whether CloseContents() has been called.