Revert issue 158379 (chrome.window.create height)

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright 2012 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/ui/views/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 1715 matching lines @@
       // unspecified location.
     if (bounds->x() == 0 && bounds->y() == 0) {
       *bounds = ChromeShellDelegate::instance()->window_positioner()->
           GetPopupPosition(*bounds);
     }
   }
   }
 #endif
 
   if ((browser_->is_type_popup() || browser_->is_type_panel()) &&
-      bounds->width() == browser_->override_bounds().width() &&
-      bounds->height() == browser_->override_bounds().height() &&
-      !(browser_->is_app() && browser_->is_session_restore()) &&
+      !browser_->is_app() &&
       !browser_->is_devtools()) {
-    // This is neither a popup window that has not been resized nor it is not an
-    // application window in the session restore phase. The value passed in
-    // |bounds| represents two pieces of information:
+    // This is non-app popup window. The value passed in |bounds| represents
+    // two pieces of information:
     // - the position of the window, in screen coordinates (outer position).
     // - the size of the content area (inner size).
     // We need to use these values to determine the appropriate size and
     // position of the resulting window.
     if (IsToolbarVisible()) {
       // If we're showing the toolbar, we need to adjust |*bounds| to include
       // its desired height, since the toolbar is considered part of the
       // window's client area as far as GetWindowBoundsForClientBounds is
       // concerned...
       bounds->set_height(
@@ skipping 974 matching lines @@
 
   Browser* modal_browser =
       chrome::FindBrowserWithWebContents(active_dialog->web_contents());
   if (modal_browser && (browser_ != modal_browser)) {
     modal_browser->window()->FlashFrame(true);
     modal_browser->window()->Activate();
   }
 
   AppModalDialogQueue::GetInstance()->ActivateModalDialog();
 }