Fix even more crashes. To help identify remaining crashes now and in the future, I have made the ...

views/desktop/desktop_window.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_DESKTOP_DESKTOP_WINDOW_H_
 #define VIEWS_DESKTOP_DESKTOP_WINDOW_H_
 
 #include "views/view.h"
 #include "views/widget/widget_delegate.h"
 
 namespace views {
 class NativeWidgetViews;
 
 namespace desktop {
 
-class DesktopWindow : public View,
-                      public WidgetDelegate {
+class DesktopWindow : public WidgetDelegateView {
  public:
    DesktopWindow();
    virtual ~DesktopWindow();
 
    static void CreateDesktopWindow();
 
    // Changes activation to the specified Widget. The currently active Widget
    // is de-activated.
    void ActivateWidget(Widget* widget);
 
@@ skipping 18 matching lines @@
 
   NativeWidgetViews* active_widget_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopWindow);
 };
 
 }  // namespace desktop
 }  // namespace views
 
 #endif  // VIEWS_DESKTOP_DESKTOP_WINDOW_H_