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

views/view.cc

 // 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.
 
 #include "views/view.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 1252 matching lines @@
 
 void View::Blur() {
   SchedulePaint();
   OnBlur();
 }
 
 // Tooltips --------------------------------------------------------------------
 
 void View::TooltipTextChanged() {
   Widget* widget = GetWidget();
-  if (widget)
+  // TooltipManager may be null if there is a problem creating it.
+  if (widget && widget->native_widget()->GetTooltipManager())
     widget->native_widget()->GetTooltipManager()->TooltipTextChanged(this);
 }
 
 // Context menus ---------------------------------------------------------------
 
 gfx::Point View::GetKeyboardContextMenuLocation() {
   gfx::Rect vis_bounds = GetVisibleBounds();
   gfx::Point screen_point(vis_bounds.x() + vis_bounds.width() / 2,
                           vis_bounds.y() + vis_bounds.height() / 2);
   ConvertPointToScreen(this, &screen_point);
@@ skipping 584 matching lines @@
     result.append(GetChildViewAt(i)->PrintViewGraph(false));
 
   if (first)
     result.append("}\n");
 
   return result;
 }
 #endif
 
 }  // namespace views