Revert 42474 - Make repost form warning tabmodal on Gtk....

chrome/browser/tab_contents/tab_contents.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/tab_contents/tab_contents.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/text_elider.h"
 #include "base/auto_reset.h"
@@ skipping 1073 matching lines @@
   if (tab_contents && tab_contents->delegate())
     tab_contents->delegate()->OnStartDownload(download);
 }
 
 void TabContents::WillClose(ConstrainedWindow* window) {
   ConstrainedWindowList::iterator it =
       find(child_windows_.begin(), child_windows_.end(), window);
   bool removed_topmost_window = it == child_windows_.begin();
   if (it != child_windows_.end())
     child_windows_.erase(it);
-  if (child_windows_.size() > 0) {
-    if (removed_topmost_window) {
-      child_windows_[0]->ShowConstrainedWindow();
-    }
+  if (removed_topmost_window && child_windows_.size() > 0) {
+    child_windows_[0]->ShowConstrainedWindow();
     BlockTabContent(true);
   } else {
     BlockTabContent(false);
   }
 }
 
 void TabContents::WillCloseBlockedPopupContainer(
     BlockedPopupContainer* container) {
   DCHECK(blocked_popups_ == container);
   blocked_popups_ = NULL;
@@ skipping 1782 matching lines @@
 }
 
 void TabContents::set_encoding(const std::string& encoding) {
   encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding);
 }
 
 void TabContents::SetAppIcon(const SkBitmap& app_icon) {
   app_icon_ = app_icon;
   NotifyNavigationStateChanged(INVALIDATE_TITLE);
 }