Factor out uses of the WebContentsModalDialog interface from platform-independent code

chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h"
 #include "content/public/browser/native_web_keyboard_event.h"
@@ skipping 20 matching lines @@
       WebDialogWebContentsDelegate* tab_delegate,
       views::WebView* view)
       : ConstrainedWebDialogDelegateBase(
             browser_context, delegate, tab_delegate),
         view_(view) {}
 
   virtual ~ConstrainedWebDialogDelegateViews() {}
 
   // WebDialogWebContentsDelegate interface.
   virtual void CloseContents(WebContents* source) OVERRIDE {
-    GetWindow()->CloseWebContentsModalDialog();
+    window_->CloseWebContentsModalDialog();
   }
 
   // contents::WebContentsDelegate
   virtual void HandleKeyboardEvent(
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event) OVERRIDE {
     unhandled_keyboard_event_handler_.HandleKeyboardEvent(
         event, view_->GetFocusManager());
   }
 
+  // ConstrainedWebDialogDelegate
+  virtual NativeWebContentsModalDialog GetNativeDialog() OVERRIDE {
+    return window_->GetNativeView();
+  }
+
+  void set_window(ConstrainedWindowViews* window) { window_ = window; }
+  ConstrainedWindowViews* window() const { return window_; }
+
  private:
   // Converts keyboard events on the WebContents to accelerators.
   UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
 
   views::WebView* view_;
+  ConstrainedWindowViews* window_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWebDialogDelegateViews);
 };
 
 }  // namespace
 
 class ConstrainedWebDialogDelegateViewViews
     : public views::WebView,
       public ConstrainedWebDialogDelegate,
       public views::WidgetDelegate {
  public:
   ConstrainedWebDialogDelegateViewViews(
       content::BrowserContext* browser_context,
       WebDialogDelegate* delegate,
       WebDialogWebContentsDelegate* tab_delegate);
   virtual ~ConstrainedWebDialogDelegateViewViews();
 
-  void set_window(WebContentsModalDialog* window) {
-    return impl_->set_window(window);
-  }
-
   // ConstrainedWebDialogDelegate interface
   virtual const WebDialogDelegate*
       GetWebDialogDelegate() const OVERRIDE {
     return impl_->GetWebDialogDelegate();
   }
   virtual WebDialogDelegate* GetWebDialogDelegate() OVERRIDE {
     return impl_->GetWebDialogDelegate();
   }
   virtual void OnDialogCloseFromWebUI() OVERRIDE {
     return impl_->OnDialogCloseFromWebUI();
   }
   virtual void ReleaseWebContentsOnDialogClose() OVERRIDE {
     return impl_->ReleaseWebContentsOnDialogClose();
   }
-  virtual WebContentsModalDialog* GetWindow() OVERRIDE {
-    return impl_->GetWindow();
+  virtual NativeWebContentsModalDialog GetNativeDialog() OVERRIDE {
+    return impl_->window()->GetNativeDialog();
   }
   virtual WebContents* GetWebContents() OVERRIDE {
     return impl_->GetWebContents();
   }
 
   // views::WidgetDelegate interface.
   virtual views::View* GetInitiallyFocusedView() OVERRIDE {
     return this;
   }
   virtual bool CanResize() const OVERRIDE { return true; }
@@ skipping 32 matching lines @@
     GetWidget()->CenterWindow(
         GetWidget()->non_client_view()->GetPreferredSize());
     views::WidgetDelegate::OnWidgetMove();
   }
 
   // views::WebView overrides.
   virtual bool AcceleratorPressed(
       const ui::Accelerator& accelerator) OVERRIDE {
     // Pressing ESC closes the dialog.
     DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.key_code());
-    GetWindow()->CloseWebContentsModalDialog();
+    impl_->window()->CloseWebContentsModalDialog();
     return true;
   }
   virtual gfx::Size GetPreferredSize() OVERRIDE {
     gfx::Size size;
     if (!impl_->closed_via_webui())
       GetWebDialogDelegate()->GetDialogSize(&size);
     return size;
   }
   virtual gfx::Size GetMinimumSize() OVERRIDE {
     // Return an empty size so that we can be made smaller.
     return gfx::Size();
   }
 
- private:
+  void SetWindow(ConstrainedWindowViews* window) {
+    impl_->set_window(window);
+  }
+
+  ConstrainedWindowViews* GetWindow() {
+    return impl_->window();
+  }
+
   scoped_ptr<ConstrainedWebDialogDelegateViews> impl_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWebDialogDelegateViewViews);
 };
 
 ConstrainedWebDialogDelegateViewViews::ConstrainedWebDialogDelegateViewViews(
     content::BrowserContext* browser_context,
     WebDialogDelegate* delegate,
     WebDialogWebContentsDelegate* tab_delegate)
     : views::WebView(browser_context),
@@ skipping 11 matching lines @@
 }
 
 ConstrainedWebDialogDelegate* CreateConstrainedWebDialog(
     content::BrowserContext* browser_context,
     WebDialogDelegate* delegate,
     WebDialogWebContentsDelegate* tab_delegate,
     content::WebContents* web_contents) {
   ConstrainedWebDialogDelegateViewViews* constrained_delegate =
       new ConstrainedWebDialogDelegateViewViews(
           browser_context, delegate, tab_delegate);
-  WebContentsModalDialog* web_contents_modal_dialog =
+  ConstrainedWindowViews* window =
       ConstrainedWindowViews::Create(web_contents, constrained_delegate);
-  constrained_delegate->set_window(web_contents_modal_dialog);
+  constrained_delegate->SetWindow(window);
   return constrained_delegate;
 }