chrome/browser/ui/cocoa/constrained_window/constrained_window_controller_browsertest.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_browsertest.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_window/constrained_window_controller.mm ('k') | chrome/browser/ui/cocoa/constrained_window/constrained_window_mac2.h » ('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_browsertest.mm

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

index cdd8b637f3ab8682ed939369f612a120081836f2..69438492a1362fb6709db35e15a53cdb10da9387 100644

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

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

@@ -7,19 +7,18 @@

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

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

#include "chrome/browser/ui/cocoa/run_loop_testing.h"

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

#include "chrome/browser/ui/tabs/tab_strip_model.h"

#include "chrome/test/base/in_process_browser_test.h"

typedef InProcessBrowserTest ConstrainedWindowControllerTest;

IN_PROC_BROWSER_TEST_F(ConstrainedWindowControllerTest, BasicTest) {

- TabContents* tab = browser()->tab_strip_model()->GetTabContentsAt(0);

+ content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0);

NSRect frame = NSMakeRect(0, 0, 100, 50);

scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:frame]);

scoped_nsobject<ConstrainedWindowController> window_controller(

[[ConstrainedWindowController alloc]

- initWithParentWebContents:tab->web_contents()

+ initWithParentWebContents:tab

embeddedView:view]);

// The window should match the view size.