Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4695)

Unified Diff: chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm

Issue 1053463002: MacViews: Use native certificate viewer in MacViews browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@translate
Patch Set: Fix for tapted and rebase Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm b/chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm
index e03e70f5ca68f91d0abdd80f865ac704b47f277a..8dd21402c0b2a6609fbe2fda4c39c5727e007706 100644
--- a/chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm
+++ b/chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm
@@ -7,10 +7,9 @@
#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,
@@ -33,7 +32,10 @@ void SingleWebContentsDialogManagerCocoa::Show() {
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();
if (!parent_window || !parent_view)
return;
@@ -71,16 +73,3 @@ void SingleWebContentsDialogManagerCocoa::HostChanged(
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
« no previous file with comments | « chrome/browser/ui/cocoa/create_native_web_modal_manager_cocoa.mm ('k') | chrome/browser/ui/cocoa/tab_dialogs_cocoa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698