diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-16 14:44:15 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-16 14:44:15 +0000 |
| commit | a3fa50969d76485450f175267049d147e3a322a5 (patch) | |
| tree | b88678142fce946ebc718e4e5073d8475f307dbe /chrome | |
| parent | 37307860c8d0c6f0cf741d8d9512bd788ca77a9a (diff) | |
| download | chromium_src-a3fa50969d76485450f175267049d147e3a322a5.zip chromium_src-a3fa50969d76485450f175267049d147e3a322a5.tar.gz chromium_src-a3fa50969d76485450f175267049d147e3a322a5.tar.bz2 | |
Make tooltip loading lazy.
BUG=none
TEST=normal tooltip tests
Review URL: http://codereview.chromium.org/126203
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/renderer_host/render_widget_host_view_mac.mm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm index 23fe34c..d44a7bc 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm +++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm @@ -52,7 +52,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget) parent_view_(NULL) { cocoa_view_ = [[[RenderWidgetHostViewCocoa alloc] initWithRenderWidgetHostViewMac:this] autorelease]; - tooltip_.reset([[ToolTip alloc] init]); render_widget_host_->set_view(this); } @@ -278,10 +277,12 @@ void RenderWidgetHostViewMac::SetTooltipText(const std::wstring& tooltip_text) { NSString* tooltip_nsstring = base::SysWideToNSString(display_text); if ([tooltip_nsstring length] == 0) { - [tooltip_ closeToolTip]; + tooltip_.reset(NULL); // The dtor closes the tooltip. } else { // Get the current mouse location in the window's coordinate system and // use that as the point for displaying the tooltip. + if (!tooltip_.get()) + tooltip_.reset([[ToolTip alloc] init]); NSPoint event_point = [[cocoa_view_ window] mouseLocationOutsideOfEventStream]; [tooltip_ showToolTipAtPoint:event_point |