summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-15 22:07:33 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-15 22:07:33 +0000
commit862deef098a8f161cb9926363bd4786f83fdbdc9 (patch)
treeb4d0169e8d30fd064a3316f2e4e3bf3dd1e8d05e /content
parent2f22bbc93302fb84904e029bec7bab83f92b071a (diff)
downloadchromium_src-862deef098a8f161cb9926363bd4786f83fdbdc9.zip
chromium_src-862deef098a8f161cb9926363bd4786f83fdbdc9.tar.gz
chromium_src-862deef098a8f161cb9926363bd4786f83fdbdc9.tar.bz2
Move TooltipClient to client namespace and add convenience setters/getters for it and the tooltip text.
BUG=none TEST=existing automation TBR=sky Review URL: http://codereview.chromium.org/8974001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114704 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/render_widget_host_view_aura.cc8
1 files changed, 2 insertions, 6 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 61cb85a..ae24ad6 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -274,12 +274,8 @@ void RenderWidgetHostViewAura::Destroy() {
void RenderWidgetHostViewAura::SetTooltipText(const string16& tooltip_text) {
tooltip_ = tooltip_text;
- void* property = aura::RootWindow::GetInstance()->GetProperty(
- aura::kRootWindowTooltipClientKey);
- if (property) {
- aura::TooltipClient* tc = static_cast<aura::TooltipClient*>(property);
- tc->UpdateTooltip(window_);
- }
+ if (aura::client::GetTooltipClient())
+ aura::client::GetTooltipClient()->UpdateTooltip(window_);
}
BackingStore* RenderWidgetHostViewAura::AllocBackingStore(