chrome/browser/ui/webui/constrained_html_ui_browsertest.cc - 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/webui/constrained_html_ui_browsertest.cc

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/views/constrained_window_views.h ('K') | « chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/constrained_html_ui_browsertest.cc

diff --git a/chrome/browser/ui/webui/constrained_html_ui_browsertest.cc b/chrome/browser/ui/webui/constrained_html_ui_browsertest.cc

index e16f82995203246913f480323926df8f85142bb3..890a986f74206e536bb95062aa44e3be29231a13 100644

--- a/chrome/browser/ui/webui/constrained_html_ui_browsertest.cc

+++ b/chrome/browser/ui/webui/constrained_html_ui_browsertest.cc

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

#include "base/message_loop.h"

#include "base/utf_string_conversions.h"

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

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

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

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

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

@@ -74,5 +75,6 @@ IN_PROC_BROWSER_TEST_F(ConstrainedHtmlDialogBrowserTest, BasicTest) {

delegate,

wrapper);

- ASSERT_EQ(1U, wrapper->tab_contents()->constrained_window_count());

+ ASSERT_EQ(1U, wrapper->constrained_window_tab_helper()->

+ constrained_window_count());

}