Use the same factor to decide if popup should tab as on non aura chromeos

chrome/browser/ui/views/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/ui/views/frame/browser_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 124 matching lines @@
 #endif
 
 #if defined(TOUCH_UI)
 #include "chrome/browser/ui/touch/status_bubble_touch.h"
 #endif
 
 using base::TimeDelta;
 using views::ColumnSet;
 using views::GridLayout;
 
+namespace {
 // The height of the status bubble.
-static const int kStatusBubbleHeight = 20;
+const int kStatusBubbleHeight = 20;
 // The name of a key to store on the window handle so that other code can
 // locate this object using just the handle.
-static const char* const kBrowserViewKey = "__BROWSER_VIEW__";
+const char* const kBrowserViewKey = "__BROWSER_VIEW__";
 // How frequently we check for hung plugin windows.
-static const int kDefaultHungPluginDetectFrequency = 2000;
+const int kDefaultHungPluginDetectFrequency = 2000;
 
 // Minimal height of devtools pane or content pane when devtools are docked
 // to the browser window.
 const int kMinDevToolsHeight = 50;
 const int kMinContentsHeight = 50;
 
+#if defined(USE_AURA) && defined(OS_CHROMEOS)
+// 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;
+#endif
+
 // How long do we wait before we consider a window hung (in ms).
-static const int kDefaultPluginMessageResponseTimeout = 30000;
+const int kDefaultPluginMessageResponseTimeout = 30000;
 // The number of milliseconds between loading animation frames.
-static const int kLoadingAnimationFrameTimeMs = 30;
+const int kLoadingAnimationFrameTimeMs = 30;
 // The amount of space we expect the window border to take up.
-static const int kWindowBorderWidth = 5;
+const int kWindowBorderWidth = 5;
 
 // How round the 'new tab' style bookmarks bar is.
-static const int kNewtabBarRoundness = 5;
+const int kNewtabBarRoundness = 5;
 // ------------
 
+}  // namespace
+
 // Returned from BrowserView::GetClassName.
 const char BrowserView::kViewClassName[] = "browser/ui/views/BrowserView";
 
 ///////////////////////////////////////////////////////////////////////////////
 // BookmarkExtensionBackground, private:
 // This object serves as the views::Background object which is used to layout
 // and paint the bookmark bar.
 class BookmarkExtensionBackground : public views::Background {
  public:
   BookmarkExtensionBackground(BrowserView* browser_view,
@@ skipping 1127 matching lines @@
 }
 
 WindowOpenDisposition BrowserView::GetDispositionForPopupBounds(
     const gfx::Rect& bounds) {
 #if defined(USE_AURA) && defined(OS_CHROMEOS)
   // If a popup is larger than a given fraction of the screen, turn it into
   // a foreground tab. Also check for width or height == 0, which would
   // indicate a tab sized popup window.
   gfx::Size size = gfx::Screen::GetMonitorAreaNearestWindow(
       GetWidget()->GetNativeView()).size();
-  if (bounds.width() > size.width() ||
+  int max_width = size.width() * kPopupMaxWidthFactor;
+  int max_height = size.height() * kPopupMaxHeightFactor;

[sadrul, 2011/11/22 21:40:25]

Ah, my bad. When I copied over the change, I failed to include the factor.

+
+  if (bounds.width() > max_width ||
       bounds.width() == 0 ||
-      bounds.height() > size.height() ||
+      bounds.height() > max_height ||
       bounds.height() == 0) {
     return NEW_FOREGROUND_TAB;
   }
 #endif
   return NEW_POPUP;
 }
 
 FindBar* BrowserView::CreateFindBar() {
   return browser::CreateFindBar(this);
 }
@@ skipping 1303 matching lines @@
   Bubble::Show(this->GetWidget(), bounds, views::BubbleBorder::TOP_RIGHT,
                views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE,
                bubble_view, bubble_view);
 }
 
 void BrowserView::ShowAvatarBubbleFromAvatarButton() {
   AvatarMenuButton* button = frame_->GetAvatarMenuButton();
   if (button)
     button->ShowAvatarBubble();
 }