Converts background_view from using WidgetGtk.

BUG=none
TEST=none
R=ben@chromium.org

Review URL: http://codereview.chromium.org/6905034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83088 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 20 insertions, 4 deletions

diff --git a/chrome/browser/chromeos/login/background_view.cc b/chrome/browser/chromeos/login/background_view.cc
index 9f5b5a9..3650562 100644
--- a/chrome/browser/chromeos/login/background_view.cc
+++ b/chrome/browser/chromeos/login/background_view.cc
@@ -40,7 +40,6 @@
 #include "views/controls/button/text_button.h"
 #include "views/controls/label.h"
 #include "views/screen.h"
-#include "views/widget/widget_gtk.h"
 #include "views/window/window.h"
 
 // X Windows headers have "#define Status int". That interferes with
@@ -49,7 +48,6 @@
 #include <X11/Xcursor/Xcursor.h>  // NOLINT
 
 using views::Widget;
-using views::WidgetGtk;
 
 namespace {
 
@@ -200,8 +198,7 @@ void BackgroundView::CreateModalPopup(views::WindowDelegate* view) {
 }
 
 gfx::NativeWindow BackgroundView::GetNativeWindow() const {
-  return
-      GTK_WINDOW(static_cast<const WidgetGtk*>(GetWidget())->GetNativeView());
+  return GetWidget()->GetNativeWindow();
 }
 
 void BackgroundView::SetStatusAreaVisible(bool visible) {
diff --git a/views/widget/widget.cc b/views/widget/widget.cc
index 380aa29..8ff0d4b 100644
--- a/views/widget/widget.cc
+++ b/views/widget/widget.cc
@@ -79,6 +79,10 @@ gfx::NativeView Widget::GetNativeView() const {
   return NULL;
 }
 
+gfx::NativeWindow Widget::GetNativeWindow() const {
+  return NULL;
+}
+
 void Widget::GenerateMousePressedForView(View* view, const gfx::Point& point) {
 }
 
diff --git a/views/widget/widget.h b/views/widget/widget.h
index fa2f89d..3a01592 100644
--- a/views/widget/widget.h
+++ b/views/widget/widget.h
@@ -119,6 +119,11 @@ class Widget : public internal::NativeWidgetDelegate,
   // Returns the gfx::NativeView associated with this Widget.
   virtual gfx::NativeView GetNativeView() const;
 
+  // Returns the gfx::NativeWindow associated with this Widget. This may return
+  // NULL on some platforms if the widget was created with a type other than
+  // TYPE_WINDOW.
+  virtual gfx::NativeWindow GetNativeWindow() const;
+
   // Starts a drag operation for the specified view. |point| is a position in
   // |view| coordinates that the drag was initiated from.
   virtual void GenerateMousePressedForView(View* view,
diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc
index edc8cf6..41bd304 100644
--- a/views/widget/widget_gtk.cc
+++ b/views/widget/widget_gtk.cc
@@ -503,6 +503,10 @@ gfx::NativeView WidgetGtk::GetNativeView() const {
   return widget_;
 }
 
+gfx::NativeWindow WidgetGtk::GetNativeWindow() const {
+  return child_ ? NULL : GTK_WINDOW(widget_);
+}
+
 bool WidgetGtk::GetAccelerator(int cmd_id, ui::Accelerator* accelerator) {
   NOTIMPLEMENTED();
   return false;
diff --git a/views/widget/widget_gtk.h b/views/widget/widget_gtk.h
index 9022a35a..eaa29cd 100644
--- a/views/widget/widget_gtk.h
+++ b/views/widget/widget_gtk.h
@@ -125,6 +125,7 @@ class WidgetGtk : public Widget,
 
   // Overridden from Widget:
   virtual gfx::NativeView GetNativeView() const;
+  virtual gfx::NativeWindow GetNativeWindow() const;
   virtual bool GetAccelerator(int cmd_id, ui::Accelerator* accelerator);
   virtual Window* GetWindow();
   virtual const Window* GetWindow() const;
diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc
index 5cacc9b..937211b 100644
--- a/views/widget/widget_win.cc
+++ b/views/widget/widget_win.cc
@@ -198,6 +198,10 @@ gfx::NativeView WidgetWin::GetNativeView() const {
   return WindowImpl::hwnd();
 }
 
+gfx::NativeWindow WidgetWin::GetNativeWindow() const {
+  return WindowImpl::hwnd();
+}
+
 bool WidgetWin::GetAccelerator(int cmd_id, ui::Accelerator* accelerator) {
   return false;
 }
diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h
index 3d7b834..3c2974b 100644
--- a/views/widget/widget_win.h
+++ b/views/widget/widget_win.h
@@ -115,6 +115,7 @@ class WidgetWin : public ui::WindowImpl,
 
   // Overridden from Widget:
   virtual gfx::NativeView GetNativeView() const OVERRIDE;
+  virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE;
   virtual bool GetAccelerator(int cmd_id,
                               ui::Accelerator* accelerator) OVERRIDE;
   virtual Window* GetWindow() OVERRIDE;