MacViews: Unify web contents modal dialog types

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

Index: chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h
diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h
index 8fd3c5251f4cd90affa82af09b73859ba8a78999..7b6d6ee70ecb88f9aa3dc3b5a3d38099c6e4d541 100644
--- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h
+++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h
@@ -7,7 +7,6 @@
 #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"
@@ -21,19 +20,14 @@ 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();
   }
@@ -44,10 +38,9 @@ class CollectedCookiesMac : public ConstrainedWindowMacDelegate,
                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);