Support web contents modal dialogs within SimpleWebViewDialog and WebUILoginView

chrome/browser/chromeos/login/simple_web_view_dialog.h

Index: chrome/browser/chromeos/login/simple_web_view_dialog.h
diff --git a/chrome/browser/chromeos/login/simple_web_view_dialog.h b/chrome/browser/chromeos/login/simple_web_view_dialog.h
index 6fb47a777f73187b86df5f6eaaf4e88fb4ad8483..07b02d4d76b7e8b91c48bdc53be209ab284c09f1 100644
--- a/chrome/browser/chromeos/login/simple_web_view_dialog.h
+++ b/chrome/browser/chromeos/login/simple_web_view_dialog.h
@@ -7,9 +7,12 @@
 
 #include <string>
 #include "base/memory/scoped_ptr.h"
+#include "base/observer_list.h"
 #include "chrome/browser/command_updater_delegate.h"
+#include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
+#include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "googleurl/src/gurl.h"
@@ -41,7 +44,9 @@ class SimpleWebViewDialog : public views::ButtonListener,
                             public ToolbarModelDelegate,
                             public CommandUpdaterDelegate,
                             public content::PageNavigator,
-                            public content::WebContentsDelegate {
+                            public content::WebContentsDelegate,
+                            public ChromeWebModalDialogManagerDelegate,
+                            public web_modal::WebContentsModalDialogHost {
  public:
   explicit SimpleWebViewDialog(Profile* profile);
   virtual ~SimpleWebViewDialog();
@@ -52,6 +57,9 @@ class SimpleWebViewDialog : public views::ButtonListener,
   // Inits view. Should be attached to a Widget before call.
   void Init();
 
+  // Overridden from views::View:
+  virtual void Layout() OVERRIDE;
+
   // Overridden from views::WidgetDelegate:
   virtual views::View* GetContentsView() OVERRIDE;
   virtual views::View* GetInitiallyFocusedView() OVERRIDE;
@@ -93,6 +101,18 @@ class SimpleWebViewDialog : public views::ButtonListener,
       int id,
       WindowOpenDisposition) OVERRIDE;
 
+  // Implements ChromeWebModalDialogManagerDelegate:
+  virtual web_modal::WebContentsModalDialogHost*
+      GetWebContentsModalDialogHost() OVERRIDE;
+
+  // Implements 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;
+
  private:
   void LoadImages();
   void UpdateButtons();
@@ -114,6 +134,8 @@ class SimpleWebViewDialog : public views::ButtonListener,
 
   scoped_ptr<StubBubbleModelDelegate> bubble_model_delegate_;
 
+  ObserverList<web_modal::WebContentsModalDialogHostObserver> observer_list_;
+
   DISALLOW_COPY_AND_ASSIGN(SimpleWebViewDialog);
 };