| Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
| diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
| index 09c44eec03c0f3295592dc7c3d4ba2133b12ab6a..0bc292f22465cf8d6adb82e7eb21c2a4f8e2aa48 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
| +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
| @@ -400,12 +400,6 @@ gfx::NativeWindow DesktopNativeWidgetAura::GetNativeWindow() const {
|
| return content_window_;
|
| }
|
|
|
| -void DesktopNativeWidgetAura::SetNativeWindowProperty(const char* name,
|
| - void* value) {
|
| - if (content_window_)
|
| - content_window_->SetNativeWindowProperty(name, value);
|
| -}
|
| -
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // DesktopNativeWidgetAura, internal::NativeWidgetPrivate implementation:
|
|
|
| @@ -610,6 +604,12 @@ void DesktopNativeWidgetAura::ViewRemoved(View* view) {
|
| drop_helper_->ResetTargetViewIfEquals(view);
|
| }
|
|
|
| +void DesktopNativeWidgetAura::SetNativeWindowProperty(const char* name,
|
| + void* value) {
|
| + if (content_window_)
|
| + content_window_->SetNativeWindowProperty(name, value);
|
| +}
|
| +
|
| void* DesktopNativeWidgetAura::GetNativeWindowProperty(const char* name) const {
|
| return content_window_ ?
|
| content_window_->GetNativeWindowProperty(name) : NULL;
|
|
|