| Index: views/widget/native_widget_win.cc
|
| ===================================================================
|
| --- views/widget/native_widget_win.cc (revision 90643)
|
| +++ views/widget/native_widget_win.cc (working copy)
|
| @@ -669,6 +669,12 @@
|
| } else {
|
| tooltip_manager_.reset(new TooltipManagerWin(GetWidget()));
|
| }
|
| + if (!tooltip_manager_->Init()) {
|
| + // There was a problem creating the TooltipManager. Common error is 127.
|
| + // See 82193 for details.
|
| + LOG_GETLASTERROR(WARNING) << "tooltip creation failed, disabling tooltips";
|
| + tooltip_manager_.reset();
|
| + }
|
|
|
| // This message initializes the window so that focus border are shown for
|
| // windows.
|
| @@ -873,7 +879,8 @@
|
| MouseEvent event(msg);
|
|
|
| if (!(event.flags() & ui::EF_IS_NON_CLIENT))
|
| - tooltip_manager_->OnMouse(message, w_param, l_param);
|
| + if (tooltip_manager_.get())
|
| + tooltip_manager_->OnMouse(message, w_param, l_param);
|
|
|
| if (event.type() == ui::ET_MOUSE_MOVED && !HasMouseCapture()) {
|
| // Windows only fires WM_MOUSELEAVE events if the application begins
|
|
|