Reland Fix Views web-modal dialog widget creation.

chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.h

 // Copyright 2014 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 CHROME_BROWSER_UI_VIEWS_EXTENSIONS_MEDIA_GALLERIES_SCAN_RESULT_DIALOG_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_MEDIA_GALLERIES_SCAN_RESULT_DIALOG_VIEWS_H_
 
 #include <map>
 
 #include "base/compiler_specific.h"
@@ skipping 63 matching lines @@
 
   void ShowContextMenu(const gfx::Point& point,
                        ui::MenuSourceType source_type,
                        MediaGalleryPrefId id);
 
   // MediaGalleriesScanResultDialog implementation:
   virtual void AcceptDialogForTesting() OVERRIDE;
 
   MediaGalleriesScanResultDialogController* controller_;
 
-  // The containing window (a weak pointer).
-  views::Widget* window_;
-
-  // The contents of the dialog. Owned by |window_|'s RootView.
+  // The contents of the dialog. Owned by the view hierarchy.
   views::View* contents_;
 
   // A map from media gallery ID to the view elements for each gallery.
   GalleryViewMap gallery_view_map_;
 
   // True if the user has pressed accept.
   bool accepted_;
 
   scoped_ptr<views::MenuRunner> context_menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesScanResultDialogViews);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_MEDIA_GALLERIES_SCAN_RESULT_DIALOG_VIEWS_H_