| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" | 5 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet.h" | 9 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet.h" |
| 10 #import "chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.h" | 10 #import "chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.h" |
| 11 #include "components/guest_view/browser/guest_view_base.h" |
| 11 #include "components/web_modal/web_contents_modal_dialog_manager.h" | 12 #include "components/web_modal/web_contents_modal_dialog_manager.h" |
| 12 #include "content/public/browser/browser_thread.h" | 13 #include "content/public/browser/browser_thread.h" |
| 13 #include "extensions/browser/guest_view/guest_view_base.h" | |
| 14 | 14 |
| 15 using web_modal::WebContentsModalDialogManager; | 15 using web_modal::WebContentsModalDialogManager; |
| 16 | 16 |
| 17 ConstrainedWindowMac::ConstrainedWindowMac( | 17 ConstrainedWindowMac::ConstrainedWindowMac( |
| 18 ConstrainedWindowMacDelegate* delegate, | 18 ConstrainedWindowMacDelegate* delegate, |
| 19 content::WebContents* web_contents, | 19 content::WebContents* web_contents, |
| 20 id<ConstrainedWindowSheet> sheet) | 20 id<ConstrainedWindowSheet> sheet) |
| 21 : delegate_(delegate) { | 21 : delegate_(delegate) { |
| 22 DCHECK(sheet); | 22 DCHECK(sheet); |
| 23 | 23 |
| 24 // |web_contents| may be embedded within a chain of nested GuestViews. If it | 24 // |web_contents| may be embedded within a chain of nested GuestViews. If it |
| 25 // is, follow the chain of embedders to the outermost WebContents and use it. | 25 // is, follow the chain of embedders to the outermost WebContents and use it. |
| 26 while (extensions::GuestViewBase* guest_view = | 26 web_contents = |
| 27 extensions::GuestViewBase::FromWebContents(web_contents)) { | 27 guest_view::GuestViewBase::GetTopLevelWebContents(web_contents); |
| 28 if (!guest_view->embedder_web_contents()) | |
| 29 break; | |
| 30 web_contents = guest_view->embedder_web_contents(); | |
| 31 } | |
| 32 | 28 |
| 33 auto manager = WebContentsModalDialogManager::FromWebContents(web_contents); | 29 auto manager = WebContentsModalDialogManager::FromWebContents(web_contents); |
| 34 scoped_ptr<SingleWebContentsDialogManagerCocoa> native_manager( | 30 scoped_ptr<SingleWebContentsDialogManagerCocoa> native_manager( |
| 35 new SingleWebContentsDialogManagerCocoa(this, sheet, manager)); | 31 new SingleWebContentsDialogManagerCocoa(this, sheet, manager)); |
| 36 manager->ShowDialogWithManager([sheet sheetWindow], native_manager.Pass()); | 32 manager->ShowDialogWithManager([sheet sheetWindow], native_manager.Pass()); |
| 37 } | 33 } |
| 38 | 34 |
| 39 ConstrainedWindowMac::~ConstrainedWindowMac() { | 35 ConstrainedWindowMac::~ConstrainedWindowMac() { |
| 40 CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); | 36 CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); |
| 41 DCHECK(!manager_); | 37 DCHECK(!manager_); |
| 42 } | 38 } |
| 43 | 39 |
| 44 void ConstrainedWindowMac::CloseWebContentsModalDialog() { | 40 void ConstrainedWindowMac::CloseWebContentsModalDialog() { |
| 45 if (manager_) | 41 if (manager_) |
| 46 manager_->Close(); | 42 manager_->Close(); |
| 47 } | 43 } |
| 48 | 44 |
| 49 void ConstrainedWindowMac::OnDialogClosing() { | 45 void ConstrainedWindowMac::OnDialogClosing() { |
| 50 if (delegate_) | 46 if (delegate_) |
| 51 delegate_->OnConstrainedWindowClosed(this); | 47 delegate_->OnConstrainedWindowClosed(this); |
| 52 } | 48 } |
| OLD | NEW |