Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7228)

Unified Diff: content/browser/tab_contents/tab_contents_view_win.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
Index: content/browser/tab_contents/tab_contents_view_win.cc
diff --git a/content/browser/tab_contents/tab_contents_view_win.cc b/content/browser/tab_contents/tab_contents_view_win.cc
index 692b04f5bfd8a1dee771ff861de1d1ec1486fc4d..dc82a8b44adfa833766463b7b7f65eec0f2cb81f 100644
--- a/content/browser/tab_contents/tab_contents_view_win.cc
+++ b/content/browser/tab_contents/tab_contents_view_win.cc
@@ -6,7 +6,6 @@
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/renderer_host/render_widget_host_view_win.h"
-#include "content/browser/tab_contents/constrained_window.h"
#include "content/browser/tab_contents/interstitial_page.h"
#include "content/browser/tab_contents/tab_contents.h"
#include "content/browser/tab_contents/tab_contents_delegate.h"
@@ -103,13 +102,6 @@ void TabContentsViewWin::Focus() {
return;
}
- if (tab_contents_->constrained_window_count() > 0) {
- ConstrainedWindow* window = *tab_contents_->constrained_window_begin();
- DCHECK(window);
- window->FocusConstrainedWindow();
- return;
- }
-
RenderWidgetHostView* rwhv = tab_contents_->GetRenderWidgetHostView();
if (rwhv) {
rwhv->Focus();

Powered by Google App Engine
This is Rietveld 408576698