FBTF: Clean up task.h in x11_util.h and header usage in some delegates.

chrome/browser/blocked_popup_container.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/blocked_popup_container.h"
 
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "gfx/rect.h"
 
 // static
 const size_t BlockedPopupContainer::kImpossibleNumberOfPopups = 30;
 
+struct BlockedPopupContainer::BlockedPopup {
+  BlockedPopup(TabContents* tab_contents,
+               const gfx::Rect& bounds)
+      : tab_contents(tab_contents), bounds(bounds) {
+  }
+
+  TabContents* tab_contents;
+  gfx::Rect bounds;
+};
+
 BlockedPopupContainer::BlockedPopupContainer(TabContents* owner)
     : owner_(owner) {
 }
 
 void BlockedPopupContainer::AddTabContents(TabContents* tab_contents,
                                            const gfx::Rect& bounds) {
   if (blocked_popups_.size() == (kImpossibleNumberOfPopups - 1)) {
     delete tab_contents;
     LOG(INFO) << "Warning: Renderer is sending more popups to us than should "
         "be possible. Renderer compromised?";
@@ skipping 89 matching lines @@
 }
 
 bool BlockedPopupContainer::IsPopup(const TabContents* source) const {
   return true;
 }
 
 TabContents* BlockedPopupContainer::GetConstrainingContents(
     TabContents* source) {
   return owner_;
 }