Fix possible memory leak due to tooltip property in aura::Window

BUG=none
TEST=none


Review URL: http://codereview.chromium.org/8418026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107819 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 2 deletions

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 0fc2348..5feacd8 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -80,6 +80,7 @@ RenderWidgetHostViewAura::RenderWidgetHostViewAura(RenderWidgetHost* host)
       ALLOW_THIS_IN_INITIALIZER_LIST(window_(new aura::Window(this))),
       is_loading_(false) {
   host_->SetView(this);
+  window_->SetProperty(aura::kTooltipTextKey, &tooltip_);
 }
 
 RenderWidgetHostViewAura::~RenderWidgetHostViewAura() {
@@ -220,8 +221,7 @@ void RenderWidgetHostViewAura::Destroy() {
 }
 
 void RenderWidgetHostViewAura::SetTooltipText(const string16& tooltip_text) {
-  string16* tooltip = new string16(tooltip_text);
-  window_->SetProperty(aura::kTooltipTextKey, tooltip);
+  tooltip_ = tooltip_text;
 }
 
 BackingStore* RenderWidgetHostViewAura::AllocBackingStore(
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
index 2f0d585..f982fdc 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.h
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h
@@ -143,6 +143,9 @@ class RenderWidgetHostViewAura : public RenderWidgetHostView,
   // removed from the list on an ET_TOUCH_RELEASED event.
   WebKit::WebTouchEvent touch_event_;
 
+  // Current tooltip text.
+  string16 tooltip_;
+
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   std::vector< base::Callback<void(void)> > on_compositing_ended_callbacks_;