Cleanup popup related browser navigation code.

chrome/browser/chromeos/frame/browser_view.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 "chrome/browser/chromeos/frame/browser_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 24 matching lines @@
 #include "views/controls/menu/menu_2.h"
 #include "views/screen.h"
 #include "views/widget/root_view.h"
 #include "views/window/hit_test.h"
 #include "views/window/window.h"
 
 namespace {
 
 // Amount to offset the toolbar by when vertical tabs are enabled.
 const int kVerticalTabStripToolbarOffset = 2;
+// If a popup window is larger than this fraction of the screen, create a tab.
+const float kPopupMaxWidthFactor = 0.5;
+const float kPopupMaxHeightFactor = 0.6;
 
 }  // namespace
 
 namespace chromeos {
 
 // LayoutManager for BrowserView, which layouts extra components such as
 // the status views as follows:
 //       ____  __ __
 //      /    \   \  \     [StatusArea]
 //
@@ skipping 253 matching lines @@
 }
 
 void BrowserView::Copy() {
   gtk_util::DoCopy(this);
 }
 
 void BrowserView::Paste() {
   gtk_util::DoPaste(this);
 }
 
+void BrowserView::AdjustNavigateParams(browser::NavigateParams* params) {
+  if (params->disposition == NEW_POPUP) {
+    // If the popup is larger than a given fraction of the screen, turn it into
+    // a foreground tab. Also check for width or height == 0, which indicate
+    // a tab sized popup window.
+    GdkScreen* screen = gdk_screen_get_default();
+    int max_width = gdk_screen_get_width(screen) * kPopupMaxWidthFactor;
+    int max_height = gdk_screen_get_height(screen) * kPopupMaxHeightFactor;
+    if (params->window_bounds.width() > max_width ||
+        params->window_bounds.width() == 0 ||
+        params->window_bounds.height() > max_height ||
+        params->window_bounds.height() == 0) {
+      params->disposition = NEW_FOREGROUND_TAB;
+    }
+  }
+}
+
 // views::ContextMenuController overrides.
 void BrowserView::ShowContextMenuForView(views::View* source,
                                          const gfx::Point& p,
                                          bool is_mouse_gesture) {
   // Only show context menu if point is in unobscured parts of browser, i.e.
   // if NonClientHitTest returns :
   // - HTCAPTION: in title bar or unobscured part of tabstrip
   // - HTNOWHERE: as the name implies.
   gfx::Point point_in_parent_coords(p);
   views::View::ConvertPointToView(NULL, parent(), &point_in_parent_coords);
@@ skipping 68 matching lines @@
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   // Create a browser view for chromeos.
   BrowserView* view;
   if (browser->type() & Browser::TYPE_POPUP)
     view = new chromeos::PanelBrowserView(browser);
   else
     view = new chromeos::BrowserView(browser);
   BrowserFrame::Create(view, browser->profile());
   return view;
 }