content: Move constrained window code from TabContents to TabContentsWrapper

content/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2011 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 "content/browser/tab_contents/tab_contents.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 30 matching lines @@
 #include "content/browser/webui/web_ui_factory.h"
 #include "content/common/bindings_policy.h"
 #include "content/common/content_client.h"
 #include "content/common/content_restriction.h"
 #include "content/common/intents_messages.h"
 #include "content/common/navigation_types.h"
 #include "content/common/notification_service.h"
 #include "content/common/url_constants.h"
 #include "content/common/view_messages.h"
 #include "net/base/net_util.h"
-#include "net/base/registry_controlled_domain.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "webkit/glue/password_form.h"
 #include "webkit/glue/web_intent_data.h"
 #include "webkit/glue/webpreferences.h"
 
 #if defined(OS_MACOSX)
 #include "ui/gfx/surface/io_surface_support_mac.h"
 #endif  // defined(OS_MACOSX)
@@ skipping 152 matching lines @@
 
 TabContents::~TabContents() {
   is_being_destroyed_ = true;
 
   // Clear out any JavaScript state.
   if (dialog_creator_)
     dialog_creator_->ResetJavaScriptState(this);
 
   NotifyDisconnected();
 
-  // First cleanly close all child windows.
-  // TODO(mpcomplete): handle case if MaybeCloseChildWindows() already asked
-  // some of these to close.  CloseWindows is async, so it might get called
-  // twice before it runs.
-  CloseConstrainedWindows();
-
   // Notify any observer that have a reference on this tab contents.
   NotificationService::current()->Notify(
       content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
       Source<TabContents>(this),
       NotificationService::NoDetails());
 
   // TODO(brettw) this should be moved to the view.
 #if defined(OS_WIN)
   // If we still have a window handle, destroy it. GetNativeView can return
   // NULL if this contents was part of a window that closed.
@@ skipping 428 matching lines @@
 
 void TabContents::ShowPageInfo(const GURL& url,
                                const NavigationEntry::SSLStatus& ssl,
                                bool show_history) {
   if (!delegate_)
     return;
 
   delegate_->ShowPageInfo(browser_context(), url, ssl, show_history);
 }
 
-void TabContents::AddConstrainedDialog(ConstrainedWindow* window) {
-  child_windows_.push_back(window);
-
-  if (child_windows_.size() == 1) {
-    window->ShowConstrainedWindow();
-    BlockTabContent(true);
-  }
-}
-
-void TabContents::BlockTabContent(bool blocked) {
-  RenderWidgetHostView* rwhv = GetRenderWidgetHostView();
-  // 70% opaque grey.
-  SkColor greyish = SkColorSetARGB(178, 0, 0, 0);
-  if (rwhv)
-    rwhv->SetVisuallyDeemphasized(blocked ? &greyish : NULL, false);
-  // RenderViewHost may be NULL during shutdown.
-  if (render_view_host())
-    render_view_host()->set_ignore_input_events(blocked);
-  if (delegate_)
-    delegate_->SetTabContentBlocked(this, blocked);
-}
-
 void TabContents::AddNewContents(TabContents* new_contents,
                                  WindowOpenDisposition disposition,
                                  const gfx::Rect& initial_pos,
                                  bool user_gesture) {
   if (!delegate_)
     return;
 
   delegate_->AddNewContents(this, new_contents, disposition, initial_pos,
                             user_gesture);
 }
@@ skipping 43 matching lines @@
     return d->CanDownload(this, request_id);
   return true;
 }
 
 void TabContents::OnStartDownload(DownloadItem* download) {
   TabContentsDelegate* d = delegate();
   if (d)
     d->OnStartDownload(this, download);
 }
 
-void TabContents::WillClose(ConstrainedWindow* window) {
-  ConstrainedWindowList::iterator i(
-      std::find(child_windows_.begin(), child_windows_.end(), window));
-  bool removed_topmost_window = i == child_windows_.begin();
-  if (i != child_windows_.end())
-    child_windows_.erase(i);
-  if (child_windows_.empty()) {
-    BlockTabContent(false);
-  } else {
-    if (removed_topmost_window)
-      child_windows_[0]->ShowConstrainedWindow();
-    BlockTabContent(true);
-  }
-}
-
 void TabContents::OnSavePage() {
   // If we can not save the page, try to download it.
   if (!SavePackage::IsSavableContents(contents_mime_type())) {
     DownloadManager* dlm = browser_context()->GetDownloadManager();
     const GURL& current_page_url = GetURL();
     if (dlm && current_page_url.is_valid()) {
       dlm->DownloadUrl(current_page_url, GURL(), "", this);
       download_stats::RecordDownloadCount(
           download_stats::INITIATED_BY_SAVE_PACKAGE_FAILURE_COUNT);
       return;
@@ skipping 492 matching lines @@
     // page.
     UpdateTargetURL(details.entry->page_id(), GURL());
   }
 
   if (!details.is_in_page) {
     // Once the main frame is navigated, we're no longer considered to have
     // displayed insecure content.
     displayed_insecure_content_ = false;
   }
 
-  // Close constrained windows if necessary.
-  if (!net::RegistryControlledDomainService::SameDomainOrHost(
-      details.previous_url, details.entry->url()))
-    CloseConstrainedWindows();
-
   // Notify observers about navigation.
   FOR_EACH_OBSERVER(TabContentsObserver, observers_,
                     DidNavigateMainFramePostCommit(details, params));
 }
 
 void TabContents::DidNavigateAnyFramePostCommit(
     RenderViewHost* render_view_host,
     const content::LoadCommittedDetails& details,
     const ViewHostMsg_FrameNavigate_Params& params) {
   // If we navigate, reset JavaScript state. This does nothing to prevent
   // a malicious script from spamming messages, since the script could just
   // reload the page to stop blocking.
   if (dialog_creator_) {
     dialog_creator_->ResetJavaScriptState(this);
     dialog_creator_ = NULL;
   }
 
   // Notify observers about navigation.
   FOR_EACH_OBSERVER(TabContentsObserver, observers_,
                     DidNavigateAnyFramePostCommit(details, params));
 }
 
-void TabContents::CloseConstrainedWindows() {
-  // Clear out any constrained windows since we are leaving this page entirely.
-  // To ensure that we iterate over every element in child_windows_ we
-  // need to use a copy of child_windows_. Otherwise if
-  // window->CloseConstrainedWindow() modifies child_windows_ we could end up
-  // skipping some elements.
-  ConstrainedWindowList child_windows_copy(child_windows_);
-  for (ConstrainedWindowList::iterator it = child_windows_copy.begin();
-       it != child_windows_copy.end(); ++it) {
-    ConstrainedWindow* window = *it;
-    if (window) {
-      window->CloseConstrainedWindow();
-      BlockTabContent(false);
-    }
-  }
-}
-
 void TabContents::UpdateMaxPageIDIfNecessary(SiteInstance* site_instance,
                                              RenderViewHost* rvh) {
   // If we are creating a RVH for a restored controller, then we might
   // have more page IDs than the SiteInstance's current max page ID.  We must
   // make sure that the max page ID is larger than any restored page ID.
   // Note that it is ok for conflicting page IDs to exist in another tab
   // (i.e., NavigationController), but if any page ID is larger than the max,
   // the back/forward list will get confused.
   int max_restored_page_id = controller_.max_restored_page_id();
   if (max_restored_page_id > 0) {
@@ skipping 509 matching lines @@
   // Notify observers.
   FOR_EACH_OBSERVER(TabContentsObserver, observers_, DidGetUserGesture());
 
   ResourceDispatcherHost* rdh =
       content::GetContentClient()->browser()->GetResourceDispatcherHost();
   if (rdh)  // NULL in unittests.
     rdh->OnUserGesture(this);
 }
 
 void TabContents::OnIgnoredUIEvent() {
-  if (constrained_window_count()) {
-    ConstrainedWindow* window = *constrained_window_begin();
-    window->FocusConstrainedWindow();
-  }
+  // Notify observers.
+  FOR_EACH_OBSERVER(TabContentsObserver, observers_, DidGetIgnoredUIEvent());
 }
 
 void TabContents::RendererUnresponsive(RenderViewHost* rvh,
                                        bool is_during_unload) {
   // Don't show hung renderer dialog for a swapped out RVH.
   if (rvh != render_view_host())
     return;
 
   // Ignore renderer unresponsive event if debugger is attached to the tab
   // since the event may be a result of the renderer sitting on a breakpoint.
@@ skipping 149 matching lines @@
 }
 
 void TabContents::SwapInRenderViewHost(RenderViewHost* rvh) {
   render_manager_.SwapInRenderViewHost(rvh);
 }
 
 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
   RenderWidgetHostView* rwh_view = view()->CreateViewForWidget(rvh);
   rwh_view->SetSize(view()->GetContainerSize());
 }