| Index: content/browser/renderer_host/render_widget_host_view_aura.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| index ad374246f96ac5d750fb9703868bb584f8262ff5..a568698e5f16cf62a986f42c79a294381bd10cd0 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| @@ -442,7 +442,7 @@ RenderWidgetHostViewAura::RenderWidgetHostViewAura(RenderWidgetHost* host)
|
| weak_ptr_factory_(this) {
|
| host_->SetView(this);
|
| window_observer_.reset(new WindowObserver(this));
|
| - aura::client::SetTooltipText(window_, &tooltip_);
|
| + aura::client::SetTooltipText(window_, &tooltip_, NULL);
|
| aura::client::SetActivationDelegate(window_, this);
|
| aura::client::SetActivationChangeObserver(window_, this);
|
| aura::client::SetFocusChangeObserver(window_, this);
|
| @@ -2864,7 +2864,7 @@ RenderWidgetHostViewAura::~RenderWidgetHostViewAura() {
|
| popup_child_host_view_->popup_parent_host_view_ = NULL;
|
| }
|
| event_filter_for_popup_exit_.reset();
|
| - aura::client::SetTooltipText(window_, NULL);
|
| + aura::client::SetTooltipText(window_, NULL, NULL);
|
| gfx::Screen::GetScreenFor(window_)->RemoveObserver(this);
|
|
|
| // This call is usually no-op since |this| object is already removed from the
|
|
|