Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1980)

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 8769011: Reland change for aura tooltips that was revert due to build break: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moved exclude to gyp file Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/aura/aura.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 101581d86e6cd41675a255903e174e282a32d054..ac54da3cc943a8bda83d238fd2014663532c54e6 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -13,6 +13,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
#include "ui/aura/client/aura_constants.h"
+#include "ui/aura/client/tooltip_client.h"
#include "ui/aura/desktop.h"
#include "ui/aura/event.h"
#include "ui/aura/window.h"
@@ -269,6 +270,12 @@ void RenderWidgetHostViewAura::Destroy() {
void RenderWidgetHostViewAura::SetTooltipText(const string16& tooltip_text) {
tooltip_ = tooltip_text;
+ void* property = aura::Desktop::GetInstance()->GetProperty(
+ aura::kDesktopTooltipClientKey);
+ if (property) {
+ aura::TooltipClient* tc = static_cast<aura::TooltipClient*>(property);
+ tc->UpdateTooltip(window_);
+ }
}
BackingStore* RenderWidgetHostViewAura::AllocBackingStore(
« no previous file with comments | « no previous file | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698