| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
| (...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 last_swapped_software_frame_scale_factor_(1.f), | 435 last_swapped_software_frame_scale_factor_(1.f), |
| 436 paint_canvas_(NULL), | 436 paint_canvas_(NULL), |
| 437 synthetic_move_sent_(false), | 437 synthetic_move_sent_(false), |
| 438 can_lock_compositor_(YES), | 438 can_lock_compositor_(YES), |
| 439 cursor_visibility_state_in_renderer_(UNKNOWN), | 439 cursor_visibility_state_in_renderer_(UNKNOWN), |
| 440 touch_editing_client_(NULL), | 440 touch_editing_client_(NULL), |
| 441 delegated_frame_evictor_(new DelegatedFrameEvictor(this)), | 441 delegated_frame_evictor_(new DelegatedFrameEvictor(this)), |
| 442 weak_ptr_factory_(this) { | 442 weak_ptr_factory_(this) { |
| 443 host_->SetView(this); | 443 host_->SetView(this); |
| 444 window_observer_.reset(new WindowObserver(this)); | 444 window_observer_.reset(new WindowObserver(this)); |
| 445 aura::client::SetTooltipText(window_, &tooltip_); | 445 aura::client::SetTooltipText(window_, &tooltip_, NULL); |
| 446 aura::client::SetActivationDelegate(window_, this); | 446 aura::client::SetActivationDelegate(window_, this); |
| 447 aura::client::SetActivationChangeObserver(window_, this); | 447 aura::client::SetActivationChangeObserver(window_, this); |
| 448 aura::client::SetFocusChangeObserver(window_, this); | 448 aura::client::SetFocusChangeObserver(window_, this); |
| 449 window_->set_layer_owner_delegate(this); | 449 window_->set_layer_owner_delegate(this); |
| 450 gfx::Screen::GetScreenFor(window_)->AddObserver(this); | 450 gfx::Screen::GetScreenFor(window_)->AddObserver(this); |
| 451 ImageTransportFactory::GetInstance()->AddObserver(this); | 451 ImageTransportFactory::GetInstance()->AddObserver(this); |
| 452 } | 452 } |
| 453 | 453 |
| 454 //////////////////////////////////////////////////////////////////////////////// | 454 //////////////////////////////////////////////////////////////////////////////// |
| 455 // RenderWidgetHostViewAura, RenderWidgetHostView implementation: | 455 // RenderWidgetHostViewAura, RenderWidgetHostView implementation: |
| (...skipping 2401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2857 DCHECK(popup_parent_host_view_->popup_child_host_view_ == NULL || | 2857 DCHECK(popup_parent_host_view_->popup_child_host_view_ == NULL || |
| 2858 popup_parent_host_view_->popup_child_host_view_ == this); | 2858 popup_parent_host_view_->popup_child_host_view_ == this); |
| 2859 popup_parent_host_view_->popup_child_host_view_ = NULL; | 2859 popup_parent_host_view_->popup_child_host_view_ = NULL; |
| 2860 } | 2860 } |
| 2861 if (popup_child_host_view_) { | 2861 if (popup_child_host_view_) { |
| 2862 DCHECK(popup_child_host_view_->popup_parent_host_view_ == NULL || | 2862 DCHECK(popup_child_host_view_->popup_parent_host_view_ == NULL || |
| 2863 popup_child_host_view_->popup_parent_host_view_ == this); | 2863 popup_child_host_view_->popup_parent_host_view_ == this); |
| 2864 popup_child_host_view_->popup_parent_host_view_ = NULL; | 2864 popup_child_host_view_->popup_parent_host_view_ = NULL; |
| 2865 } | 2865 } |
| 2866 event_filter_for_popup_exit_.reset(); | 2866 event_filter_for_popup_exit_.reset(); |
| 2867 aura::client::SetTooltipText(window_, NULL); | 2867 aura::client::SetTooltipText(window_, NULL, NULL); |
| 2868 gfx::Screen::GetScreenFor(window_)->RemoveObserver(this); | 2868 gfx::Screen::GetScreenFor(window_)->RemoveObserver(this); |
| 2869 | 2869 |
| 2870 // This call is usually no-op since |this| object is already removed from the | 2870 // This call is usually no-op since |this| object is already removed from the |
| 2871 // Aura root window and we don't have a way to get an input method object | 2871 // Aura root window and we don't have a way to get an input method object |
| 2872 // associated with the window, but just in case. | 2872 // associated with the window, but just in case. |
| 2873 DetachFromInputMethod(); | 2873 DetachFromInputMethod(); |
| 2874 | 2874 |
| 2875 if (resource_collection_.get()) | 2875 if (resource_collection_.get()) |
| 2876 resource_collection_->SetClient(NULL); | 2876 resource_collection_->SetClient(NULL); |
| 2877 | 2877 |
| (...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3170 RenderWidgetHost* widget) { | 3170 RenderWidgetHost* widget) { |
| 3171 return new RenderWidgetHostViewAura(widget); | 3171 return new RenderWidgetHostViewAura(widget); |
| 3172 } | 3172 } |
| 3173 | 3173 |
| 3174 // static | 3174 // static |
| 3175 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 3175 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 3176 GetScreenInfoForWindow(results, NULL); | 3176 GetScreenInfoForWindow(results, NULL); |
| 3177 } | 3177 } |
| 3178 | 3178 |
| 3179 } // namespace content | 3179 } // namespace content |
| OLD | NEW |