chrome/browser/ui/views/default_search_view.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/views/default_search_view.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/constrained_window_views.cc ('k') | chrome/browser/ui/views/repost_form_warning_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/default_search_view.cc

diff --git a/chrome/browser/ui/views/default_search_view.cc b/chrome/browser/ui/views/default_search_view.cc

index 098564b8cea221ae33f9f41c9dec1cfc4b7cd11b..8bfbfade49954b608ba89b79d4636adf50f0f416 100644

--- a/chrome/browser/ui/views/default_search_view.cc

+++ b/chrome/browser/ui/views/default_search_view.cc

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

#include "chrome/browser/search_engines/template_url.h"

#include "chrome/browser/search_engines/template_url_service.h"

#include "chrome/browser/search_engines/template_url_prepopulate_data.h"

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

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

#include "content/browser/tab_contents/tab_contents.h"

#include "grit/generated_resources.h"

@@ -194,7 +195,9 @@ DefaultSearchView::DefaultSearchView(TabContents* tab_contents,

SetupControls(prefs);

// Show the dialog.

- new ConstrainedWindowViews(tab_contents, this);

+ TabContentsWrapper* wrapper =

+ TabContentsWrapper::GetCurrentWrapperForContents(tab_contents);

+ new ConstrainedWindowViews(wrapper, this);

}

void DefaultSearchView::SetupControls(PrefService* prefs) {