Fixes crash introduced by fix for 11229. The fix for 11229 made it so

views/widget/widget.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_WIDGET_H_
 #define VIEWS_WIDGET_WIDGET_H_
 #pragma once
 
 #include <stack>
 
@@ skipping 464 matching lines @@
   }
   const NonClientView* non_client_view() const {
     return non_client_view_;
   }
 
   ClientView* client_view() {
     return const_cast<ClientView*>(
         const_cast<const Widget*>(this)->client_view());
   }
   const ClientView* client_view() const {
-    return non_client_view()->client_view();
+    return non_client_view() ? non_client_view()->client_view() : NULL;

[Peter Kasting, 2011/07/20 23:09:40]

Nit: Might as well use |non_client_view_| directly instead of the accessor

   }
 
 #if defined(UNIT_TEST)
   static void set_compositor_factory(ui::Compositor*(*factory)()) {
     compositor_factory_ = factory;
   }
 #endif
   static ui::Compositor* (*compositor_factory())() {
     return compositor_factory_;
   }
@@ skipping 202 matching lines @@
 
   // Factory used to create Compositors. Settable by tests.
   static ui::Compositor*(*compositor_factory_)();
 
   DISALLOW_COPY_AND_ASSIGN(Widget);
 };
 
 }  // namespace views
 
 #endif // VIEWS_WIDGET_WIDGET_H_