MacViews: Unify web contents modal dialog types

chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h

 // Copyright (c) 2012 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
-#include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
 #import "chrome/browser/ui/cocoa/content_settings/cookie_tree_node.h"
 #import "chrome/browser/ui/cocoa/content_settings/cookies_tree_controller_bridge.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 @class CollectedCookiesWindowController;
 @class CookieDetailsViewController;
 @class VerticalGradientView;
 
 namespace content {
 class WebContents;
 }
 
-// The constrained window delegate reponsible for managing the collected
-// cookies dialog.
-class CollectedCookiesMac : public ConstrainedWindowMacDelegate,
-                            public content::NotificationObserver {
+// Reponsible for managing the collected cookies dialog.
+class CollectedCookiesMac : public content::NotificationObserver {
  public:
   CollectedCookiesMac(content::WebContents* web_contents);
   ~CollectedCookiesMac() override;
 
   void PerformClose();
 
-  // ConstrainedWindowMacDelegate implementation.
-  void OnConstrainedWindowClosed(ConstrainedWindowMac* window) override;
-
   CollectedCookiesWindowController* sheet_controller() const {
     return sheet_controller_.get();
   }
 
  private:
   // NotificationObserver implementation.
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
+  content::WebContents* web_contents_;  // weak

[tapted, 2015/02/25 06:23:28]

This weak reference spooks me out a little. It's not clear that it's guaranteed
to outlive the dialog.

CollectedCookiesMac is currently self-deleting. I think the
WebContentsModalDialogManager ensures it gets closed, so perhaps it would be
clearer to have a weak reference to the WebContentsModalDialogManager instead,
with a comment like

// Weak. Closes this dialog.

Or "Weak. Owns this." except that while it's self-deleting that's a bit of a
gray statement.

   content::NotificationRegistrar registrar_;
 
-  scoped_ptr<ConstrainedWindowMac> window_;
-
   base::scoped_nsobject<CollectedCookiesWindowController> sheet_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(CollectedCookiesMac);
 };
 
 // Controller for the collected cookies dialog. This class stores an internal
 // copy of the CookiesTreeModel but with Cocoa-converted values (NSStrings and
 // NSImages instead of std::strings and ImageSkias). Doing this allows us to use
 // bindings for the interface. Changes are pushed to this internal model via a
 // very thin bridge (see cookies_window_controller.h).
@@ skipping 80 matching lines @@
 - (CookiesTreeModel*)allowedTreeModel;
 - (CookiesTreeModel*)blockedTreeModel;
 
 - (void)loadTreeModelFromWebContents;
 
 // Given an array of selected NSTreeNode objects, normalizes the selection so
 // that it does not contain any children whose parents are also in the array.
 + (NSArray*)normalizeNodeSelection:(NSArray*)selection;
 
 @end