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

Unified Diff: chrome/browser/tab_contents.cc

Issue 7388: Remove throttling code from the Browser process and... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 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/tab_contents.h ('k') | chrome/browser/views/constrained_window_impl_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tab_contents.cc
===================================================================
--- chrome/browser/tab_contents.cc (revision 3394)
+++ chrome/browser/tab_contents.cc (working copy)
@@ -21,8 +21,6 @@
#include "generated_resources.h"
-static size_t kMaxNumberOfConstrainedPopups = 20;
-
namespace {
BOOL CALLBACK InvalidateWindow(HWND hwnd, LPARAM lparam) {
@@ -284,6 +282,8 @@
popup_owner = our_owner;
popup_owner->AddConstrainedPopup(new_contents, initial_pos);
} else {
+ new_contents->DisassociateFromPopupCount();
+
delegate_->AddNewContents(this, new_contents, disposition, initial_pos,
user_gesture);
}
@@ -291,11 +291,6 @@
void TabContents::AddConstrainedPopup(TabContents* new_contents,
const gfx::Rect& initial_pos) {
- if (child_windows_.size() > kMaxNumberOfConstrainedPopups) {
- new_contents->CloseContents();
- return;
- }
-
ConstrainedWindow* window =
ConstrainedWindow::CreateConstrainedPopup(
this, initial_pos, new_contents);
@@ -500,6 +495,7 @@
int frame_component) {
WillClose(window);
if (delegate_) {
+ contents->DisassociateFromPopupCount();
delegate_->StartDraggingDetachedContents(
this, contents, contents_bounds, mouse_pt, frame_component);
}
« no previous file with comments | « chrome/browser/tab_contents.h ('k') | chrome/browser/views/constrained_window_impl_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698