chrome/browser/ui/cocoa/constrained_window/constrained_window_controller.mm - Issue 11111022: Remove TabContents from constrained windows.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/constrained_window/constrained_window_controller.mm

Issue 11111022: Remove TabContents from constrained windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove unrelated gtk code Created 8 years, 2 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 | « chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm ('k') | chrome/browser/ui/cocoa/constrained_window/constrained_window_controller_browsertest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/constrained_window/constrained_window_controller.mm

diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_controller.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_controller.mm

index 942105c82169c3592376e420afe89a239354e434..b02ceadc84968901a37c3e40733acdc2ca0bf84f 100644

--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_controller.mm

+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_controller.mm

@@ -7,7 +7,6 @@

#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.h"

#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac2.h"

#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h"

-#include "chrome/browser/ui/tab_contents/tab_contents.h"

@interface ConstrainedWindowController ()

- (void)onEmbeddedViewFrameDidChange:(NSNotification*)note;

@@ -30,8 +29,7 @@

name:NSViewFrameDidChangeNotification

object:embeddedView];

- constrainedWindow_ = new ConstrainedWindowMac2(

- TabContents::FromWebContents(parentWebContents), window);

+ constrainedWindow_ = new ConstrainedWindowMac2(parentWebContents, window);

}

return self;

}