diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-16 17:21:23 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-16 17:21:23 +0000 |
| commit | 2f2b57b7e32777e656d4dbbbc04cd914d5b94472 (patch) | |
| tree | 9e925e8063d39c06c4edb068d2f3a371ff395589 /views/controls/native | |
| parent | 4e8655deaccc49465a6c18055887d1e0e2501a55 (diff) | |
| download | chromium_src-2f2b57b7e32777e656d4dbbbc04cd914d5b94472.zip chromium_src-2f2b57b7e32777e656d4dbbbc04cd914d5b94472.tar.gz chromium_src-2f2b57b7e32777e656d4dbbbc04cd914d5b94472.tar.bz2 | |
Re-land:
Move private NativeWidget methods to new internal interface
NativeWidgetPrivate.
This should make it harder to abuse accidentally.
BUG=72040
TEST=none
Review URL: http://codereview.chromium.org/7170019
Review URL: http://codereview.chromium.org/7189012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89357 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/native')
| -rw-r--r-- | views/controls/native/native_view_host.cc | 8 | ||||
| -rw-r--r-- | views/controls/native/native_view_host_win.cc | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/views/controls/native/native_view_host.cc b/views/controls/native/native_view_host.cc index 1b9d74e..1a304a6 100644 --- a/views/controls/native/native_view_host.cc +++ b/views/controls/native/native_view_host.cc @@ -8,7 +8,6 @@ #include "ui/gfx/canvas.h" #include "views/controls/native/native_view_host_wrapper.h" #include "views/controls/native/native_view_host_views.h" -#include "views/widget/native_widget.h" #include "views/widget/widget.h" namespace views { @@ -190,12 +189,9 @@ bool NativeViewHost::ContainsNativeView(gfx::NativeView native_view) const { if (!native_view_) return false; - views::NativeWidget* native_widget = - views::NativeWidget::GetNativeWidgetForNativeView(native_view_); - if (native_widget && - native_widget->GetWidget()->ContainsNativeView(native_view)) { + views::Widget* widget = views::Widget::GetWidgetForNativeView(native_view); + if (widget && widget->ContainsNativeView(native_view)) return true; - } return View::ContainsNativeView(native_view); } diff --git a/views/controls/native/native_view_host_win.cc b/views/controls/native/native_view_host_win.cc index b7fa074..52f9373 100644 --- a/views/controls/native/native_view_host_win.cc +++ b/views/controls/native/native_view_host_win.cc @@ -37,8 +37,8 @@ void NativeViewHostWin::NativeViewAttached() { // borders), when we change the parent below. ShowWindow(host_->native_view(), SW_HIDE); - NativeWidget::ReparentNativeView(host_->native_view(), - host_->GetWidget()->GetNativeView()); + Widget::ReparentNativeView(host_->native_view(), + host_->GetWidget()->GetNativeView()); host_->Layout(); } |