summaryrefslogtreecommitdiffstats
path: root/views/window/window.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-21 16:54:50 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-21 16:54:50 +0000
commitc642dbbd4b8d3c44cf6092b0b8ecfab2be8992e5 (patch)
treec36eaad8f67fface68c71a0d292eedc151438e52 /views/window/window.cc
parentb964e3589f3127be36cddf3deade64f00e2afc2c (diff)
downloadchromium_src-c642dbbd4b8d3c44cf6092b0b8ecfab2be8992e5.zip
chromium_src-c642dbbd4b8d3c44cf6092b0b8ecfab2be8992e5.tar.gz
chromium_src-c642dbbd4b8d3c44cf6092b0b8ecfab2be8992e5.tar.bz2
Add CreateParams to Widget, and replace CreatePopupWidget with CreateParams.
BUG=72040 TEST=none Review URL: http://codereview.chromium.org/6712008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78893 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window/window.cc')
-rw-r--r--views/window/window.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/views/window/window.cc b/views/window/window.cc
index ba7d055..16d4170 100644
--- a/views/window/window.cc
+++ b/views/window/window.cc
@@ -236,6 +236,15 @@ const Widget* Window::AsWidget() const {
}
////////////////////////////////////////////////////////////////////////////////
+// Window, protected:
+
+void Window::SetNativeWindow(NativeWindow* native_window) {
+ native_window_ = native_window;
+ native_window->AsNativeWidget()->GetWidget()->set_widget_delegate(
+ window_delegate_);
+}
+
+////////////////////////////////////////////////////////////////////////////////
// Window, internal::NativeWindowDelegate implementation:
bool Window::CanActivate() const {