MacViews: Use native certificate viewer in MacViews browser.

chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm

 // Copyright 2015 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/single_web_contents_dialog_manager_cocoa.h"
 
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h"
-#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
+#include "chrome/browser/ui/tab_dialogs.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
-
-using web_modal::SingleWebContentsDialogManagerDelegate;
+#include "content/public/browser/web_contents.h"
 
 SingleWebContentsDialogManagerCocoa::SingleWebContentsDialogManagerCocoa(
     ConstrainedWindowMac* client,
     id<ConstrainedWindowSheet> sheet,
     web_modal::SingleWebContentsDialogManagerDelegate* delegate)
     : client_(client),
       sheet_([sheet retain]),
       delegate_(delegate),
       shown_(false) {
   if (client)
     client->set_manager(this);
 }
 
 SingleWebContentsDialogManagerCocoa::~SingleWebContentsDialogManagerCocoa() {
 }
 
 void SingleWebContentsDialogManagerCocoa::Show() {
   if (shown_)
     return;
 
   content::WebContents* web_contents = delegate_->GetWebContents();
   NSWindow* parent_window = web_contents->GetTopLevelNativeWindow();
-  NSView* parent_view = GetSheetParentViewForWebContents(web_contents);
+  TabDialogs* tab_dialogs = TabDialogs::FromWebContents(web_contents);
+  // |tab_dialogs| is null when |web_contents| is inside a packaged app window.
+  NSView* parent_view = tab_dialogs ? tab_dialogs->GetDialogParentView()
+                                    : web_contents->GetNativeView();

[Andre, 2015/04/02 04:04:27]

This is a change when showing a dialog over an app window.
|parent_view| was [web_contents->GetNativeView() superview] which is the
window's contentView, now it's web_contents->GetNativeView().
The result should be the same since they have the same bounds.

   if (!parent_window || !parent_view)
     return;
 
   shown_ = true;
   [[ConstrainedWindowSheetController controllerForParentWindow:parent_window]
       showSheet:sheet_ forParentView:parent_view];
 }
 
 void SingleWebContentsDialogManagerCocoa::Hide() {
 }
@@ skipping 17 matching lines @@
       pulseSheet:sheet_];
 }
 
 void SingleWebContentsDialogManagerCocoa::HostChanged(
     web_modal::WebContentsModalDialogHost* new_host) {
 }
 
 gfx::NativeWindow SingleWebContentsDialogManagerCocoa::dialog() {
   return [sheet_ sheetWindow];
 }
-
-namespace web_modal {
-
-SingleWebContentsDialogManager*
-WebContentsModalDialogManager::CreateNativeWebModalManager(
-    gfx::NativeWindow dialog,
-    SingleWebContentsDialogManagerDelegate* delegate) {
-  base::scoped_nsobject<CustomConstrainedWindowSheet> sheet(
-      [[CustomConstrainedWindowSheet alloc] initWithCustomWindow:dialog]);
-  return new SingleWebContentsDialogManagerCocoa(nullptr, sheet, delegate);
-}
-
-}  // namespace web_modal