| Index: content/browser/web_contents/web_contents_view_aura.cc
|
| diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
|
| index 3d0b9c74214fe66f539398b84c96f136bc2d5e26..18651d29d5ff331ef687dbfc51f8d4759786cc34 100644
|
| --- a/content/browser/web_contents/web_contents_view_aura.cc
|
| +++ b/content/browser/web_contents/web_contents_view_aura.cc
|
| @@ -473,7 +473,7 @@ class WebContentsViewAura::WindowObserver
|
|
|
| void OnWindowParentChanged(aura::Window* window,
|
| aura::Window* parent) override {
|
| - if (window != view_->window_)
|
| + if (window != view_->window_.get())
|
| return;
|
|
|
| aura::Window* host_window =
|
| @@ -529,7 +529,7 @@ class WebContentsViewAura::WindowObserver
|
| void OnWindowBoundsChanged(aura::Window* window,
|
| const gfx::Rect& old_bounds,
|
| const gfx::Rect& new_bounds) override {
|
| - if (window == host_window_ || window == view_->window_) {
|
| + if (window == host_window_ || window == view_->window_.get()) {
|
| SendScreenRects();
|
| if (old_bounds.origin() != new_bounds.origin()) {
|
| TouchSelectionControllerClientAura* selection_controller_client =
|
| @@ -552,7 +552,7 @@ class WebContentsViewAura::WindowObserver
|
| }
|
|
|
| void OnWindowAddedToRootWindow(aura::Window* window) override {
|
| - if (window == view_->window_) {
|
| + if (window == view_->window_.get()) {
|
| window->GetHost()->AddObserver(this);
|
| #if defined(OS_WIN)
|
| if (!window->GetRootWindow()->HasObserver(this))
|
| @@ -563,7 +563,7 @@ class WebContentsViewAura::WindowObserver
|
|
|
| void OnWindowRemovingFromRootWindow(aura::Window* window,
|
| aura::Window* new_root) override {
|
| - if (window == view_->window_) {
|
| + if (window == view_->window_.get()) {
|
| window->GetHost()->RemoveObserver(this);
|
| #if defined(OS_WIN)
|
| window->GetRootWindow()->RemoveObserver(this);
|
|
|