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

Unified Diff: views/widget/native_widget_aura.cc

Issue 8371024: Enable tooltips for aura. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: added file missing in previous patch Created 9 years, 2 months 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
Index: views/widget/native_widget_aura.cc
diff --git a/views/widget/native_widget_aura.cc b/views/widget/native_widget_aura.cc
index 5b63f8fc57f2d6dc43eda2a9c78b685a53e8cec1..7d3f12ea9527013a3e79793ea6c6d62536837df4 100644
--- a/views/widget/native_widget_aura.cc
+++ b/views/widget/native_widget_aura.cc
@@ -15,6 +15,7 @@
#include "ui/gfx/font.h"
#include "ui/gfx/screen.h"
#include "views/widget/native_widget_delegate.h"
+#include "views/widget/tooltip_manager_views.h"
#if defined(OS_WIN)
#include "base/win/scoped_gdi_object.h"
@@ -90,6 +91,12 @@ void NativeWidgetAura::InitNativeWidget(const Widget::InitParams& params) {
// TODO(beng): do this some other way.
delegate_->OnNativeWidgetSizeChanged(params.bounds.size());
can_activate_ = params.can_activate;
+ if (params.type != Widget::InitParams::TYPE_TOOLTIP && !params.child) {
+ DCHECK(GetWidget()->GetRootView());
+ views::TooltipManagerViews* manager = new views::TooltipManagerViews(
+ GetWidget()->GetRootView());
+ tooltip_manager_.reset(manager);
+ }
}
NonClientFrameView* NativeWidgetAura::CreateNonClientFrameView() {
@@ -170,8 +177,7 @@ void* NativeWidgetAura::GetNativeWindowProperty(const char* name) const {
}
TooltipManager* NativeWidgetAura::GetTooltipManager() const {
- //NOTIMPLEMENTED();
- return NULL;
+ return tooltip_manager_.get();
}
bool NativeWidgetAura::IsScreenReaderActive() const {

Powered by Google App Engine
This is Rietveld 408576698