MacViews: Unify web contents modal dialog types

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

 // 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 "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h"
 
 #include <vector>
 
 #include "base/mac/bundle_locations.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
-#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"
 #import "chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.h"
 #import "chrome/browser/ui/cocoa/vertical_gradient_view.h"
 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/theme_resources.h"
 #include "third_party/apple_sample_code/ImageAndTextCell.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 
 namespace {
 // Colors for the infobar.
 const double kBannerGradientColorTop[3] =
     {255.0 / 255.0, 242.0 / 255.0, 183.0 / 255.0};
 const double kBannerGradientColorBottom[3] =
     {250.0 / 255.0, 230.0 / 255.0, 145.0 / 255.0};
 const double kBannerStrokeColor = 135.0 / 255.0;
 
 enum TabViewItemIndices {
   kAllowedCookiesTabIndex = 0,
   kBlockedCookiesTabIndex
 };
 
 } // namespace
 
-#pragma mark Constrained window delegate
+using web_modal::WebContentsModalDialogManager;
 
-CollectedCookiesMac::CollectedCookiesMac(content::WebContents* web_contents) {
+CollectedCookiesMac::CollectedCookiesMac(content::WebContents* web_contents)
+    : web_contents_(web_contents) {
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents);
   registrar_.Add(this, chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN,
                  content::Source<TabSpecificContentSettings>(content_settings));
 
   sheet_controller_.reset([[CollectedCookiesWindowController alloc]
       initWithWebContents:web_contents
       collectedCookiesMac:this]);
 
-  base::scoped_nsobject<CustomConstrainedWindowSheet> sheet(
-      [[CustomConstrainedWindowSheet alloc]
-          initWithCustomWindow:[sheet_controller_ window]]);
-  window_.reset(new ConstrainedWindowMac(
-      this, web_contents, sheet));
+  WebContentsModalDialogManager::FromWebContents(web_contents)
+      ->ShowModalDialog([sheet_controller_ window]);
 }
 
 CollectedCookiesMac::~CollectedCookiesMac() {
 }
 
 void CollectedCookiesMac::Observe(int type,
                                   const content::NotificationSource& source,
                                   const content::NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN);
-  window_->CloseWebContentsModalDialog();
+  PerformClose();
 }
 
 void CollectedCookiesMac::PerformClose() {
-  window_->CloseWebContentsModalDialog();
-}
-
-void CollectedCookiesMac::OnConstrainedWindowClosed(
-    ConstrainedWindowMac* window) {
+  WebContentsModalDialogManager::FromWebContents(web_contents_)
+      ->WillClose([sheet_controller_ window]);
   base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);

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

I'm not familiar with the CollectedCookies dialog.. but the guarantee that this
can be called only once may have been lost. i.e. both the observer and
closeSheet: call PerformClose() -- can they fight?

Maybe the Delete can be triggered via windowWillClose?

 }
 
 #pragma mark Window Controller
 
 @interface CollectedCookiesWindowController (Private)
 - (void)showInfoBarForDomain:(const base::string16&)domain
                      setting:(ContentSetting)setting;
 - (void)showInfoBarForMultipleDomainsAndSetting:(ContentSetting)setting;
 - (void)animateInfoBar;
 @end
@@ skipping 407 matching lines @@
       treeController = blockedTreeController_;
       break;
     default:
       NOTREACHED();
       return;
   }
   [detailsViewController_ configureBindingsForTreeController:treeController];
 }
 
 @end