chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm - Issue 7880003: content: Move constrained window code from TabContents to TabContentsWrapper

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/content_settings/collected_cookies_mac.mm

Issue 7880003: content: Move constrained window code from TabContents to TabContentsWrapper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Attempt to fix views merge part 2 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

« chrome/browser/ui/cocoa/constrained_window_mac.h ('K') | « chrome/browser/ui/cocoa/constrained_window_mac.mm ('k') | chrome/browser/ui/cocoa/repost_form_warning_mac.mm » ('j') | chrome/browser/ui/constrained_window_tab_helper.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

index 75e160686d86324dac54ab9e1d7a9adf88ca532d..6b01865622d3aea07d1e66fe78b60dfea8546e96 100644

--- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

+++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

@@ -92,7 +92,7 @@ CollectedCookiesMac::CollectedCookiesMac(NSWindow* parent,

set_sheet([sheet_controller_ window]);

- window_ = new ConstrainedWindowMac(wrapper->tab_contents(), this);

+ window_ = new ConstrainedWindowMac(wrapper, this);

}

CollectedCookiesMac::~CollectedCookiesMac() {