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

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

Issue 7860008: content: Move constrained html windows to TabContentsWrapper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: views fix Created 9 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm
diff --git a/chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm b/chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm
index 914b5f3f4987931cb36ac75c26a597b052b40a52..3204429aff126855b0a5ed3123e494b9b3ed57dc 100644
--- a/chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm
+++ b/chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm
@@ -9,6 +9,7 @@
#include "base/memory/scoped_nsobject.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/cocoa/constrained_window_mac.h"
+#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h"
#include "content/browser/tab_contents/tab_contents.h"
@@ -132,13 +133,13 @@ void ConstrainedHtmlDelegateMac::OnDialogCloseFromWebUI() {
ConstrainedWindow* ConstrainedHtmlUI::CreateConstrainedHtmlDialog(
Profile* profile,
HtmlDialogUIDelegate* delegate,
- TabContents* overshadowed) {
+ TabContentsWrapper* wrapper) {
// Deleted when ConstrainedHtmlDelegateMac::DeleteDelegate() runs.
ConstrainedHtmlDelegateMac* constrained_delegate =
new ConstrainedHtmlDelegateMac(profile, delegate);
// Deleted when ConstrainedHtmlDelegateMac::OnDialogCloseFromWebUI() runs.
ConstrainedWindow* constrained_window =
- new ConstrainedWindowMac(overshadowed, constrained_delegate);
+ new ConstrainedWindowMac(wrapper->tab_contents(), constrained_delegate);
constrained_delegate->set_window(constrained_window);
return constrained_window;
}
« no previous file with comments | « no previous file | chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698