chrome/browser/ui/tab_contents/tab_contents_wrapper.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/tab_contents/tab_contents_wrapper.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/gtk/constrained_window_gtk.h ('K') | « chrome/browser/ui/tab_contents/tab_contents_wrapper.h ('k') | chrome/browser/ui/views/collected_cookies_win.cc » ('j') | chrome/browser/ui/views/constrained_window_views.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

index 2cd321f7daba6c5c2085a390a8b2be5d68baf1fc..7a97a87104e988296c9c054c2676b5e3d184d97b 100644

--- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

+++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

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

#include "chrome/browser/translate/translate_tab_helper.h"

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

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

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

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

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

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

@@ -250,6 +251,7 @@ TabContentsWrapper::TabContentsWrapper(TabContents* contents)

automation_tab_helper_.reset(new AutomationTabHelper(contents));

blocked_content_tab_helper_.reset(new BlockedContentTabHelper(this));

bookmark_tab_helper_.reset(new BookmarkTabHelper(this));

+ constrained_window_tab_helper_.reset(new ConstrainedWindowTabHelper(this));

extension_tab_helper_.reset(new ExtensionTabHelper(this));

favicon_tab_helper_.reset(new FaviconTabHelper(contents));

find_tab_helper_.reset(new FindTabHelper(contents));