Merge 88897 - Disables tooltips if we can't create the tooltip window. I still don't

views/widget/native_widget_win.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_
 #define VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_
 #pragma once
 
 #include <atlbase.h>
 #include <atlapp.h>
@@ skipping 381 matching lines @@
   virtual void OnScreenReaderDetected();
 
   // Sets-up the focus manager with the view that should have focus when the
   // window is shown the first time.  If NULL is returned, the focus goes to the
   // button if there is one, otherwise the to the Cancel button.
   virtual void SetInitialFocus();
 
   // Executes the specified SC_command.
   void ExecuteSystemMenuCommand(int command);
 
-  // The TooltipManager.
+  // The TooltipManager. This is NULL if there is a problem creating the
+  // underlying tooltip window.
   // WARNING: RootView's destructor calls into the TooltipManager. As such, this
   // must be destroyed AFTER root_view_.
   scoped_ptr<TooltipManagerWin> tooltip_manager_;
 
   scoped_refptr<DropTargetWin> drop_target_;
 
   // Are a subclass of NativeWindowWin?
   bool is_window_;
 
   const gfx::Rect& invalid_rect() const { return invalid_rect_; }
@@ skipping 111 matching lines @@
 
   // Indicates if the |input_method_| is an InputMethodWin instance.
   bool is_input_method_win_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetWin);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_