Support web contents modal dialogs within SimpleWebViewDialog and WebUILoginView

chrome/browser/chromeos/login/webui_login_view.h

Index: chrome/browser/chromeos/login/webui_login_view.h
diff --git a/chrome/browser/chromeos/login/webui_login_view.h b/chrome/browser/chromeos/login/webui_login_view.h
index 10afc8782ce9bb71be964a9d3f4864377fadfa91..b7e36ac1eba783dd4c3071344c2973c1305be9f8 100644
--- a/chrome/browser/chromeos/login/webui_login_view.h
+++ b/chrome/browser/chromeos/login/webui_login_view.h
@@ -9,7 +9,10 @@
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
+#include "base/observer_list.h"
 #include "chrome/browser/extensions/scoped_gaia_auth_extension.h"
+#include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
+#include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_delegate.h"
@@ -35,7 +38,9 @@ namespace chromeos {
 // WebUI based start up and lock screens. It contains a WebView.
 class WebUILoginView : public views::View,
                        public content::WebContentsDelegate,
-                       public content::NotificationObserver {
+                       public content::NotificationObserver,
+                       public ChromeWebModalDialogManagerDelegate,
+                       public web_modal::WebContentsModalDialogHost {
  public:
   // Internal class name.
   static const char kViewClassName[];
@@ -51,6 +56,18 @@ class WebUILoginView : public views::View,
       const ui::Accelerator& accelerator) OVERRIDE;
   virtual const char* GetClassName() const OVERRIDE;
 
+  // Overridden from ChromeWebModalDialogManagerDelegate:
+  virtual web_modal::WebContentsModalDialogHost*
+      GetWebContentsModalDialogHost() OVERRIDE;
+
+  // Overridden from web_modal::WebContentsModalDialogHost:
+  virtual gfx::NativeView GetHostView() const OVERRIDE;
+  virtual gfx::Point GetDialogPosition(const gfx::Size& size) OVERRIDE;
+  virtual void AddObserver(
+      web_modal::WebContentsModalDialogHostObserver* observer) OVERRIDE;
+  virtual void RemoveObserver(
+      web_modal::WebContentsModalDialogHostObserver* observer) OVERRIDE;
+
   // Called when WebUI window is created.
   virtual void OnWindowCreated();
 
@@ -161,6 +178,8 @@ class WebUILoginView : public views::View,
 
   scoped_ptr<ScopedGaiaAuthExtension> auth_extension_;
 
+  ObserverList<web_modal::WebContentsModalDialogHostObserver> observer_list_;
+
   DISALLOW_COPY_AND_ASSIGN(WebUILoginView);
 };