Cleanup popup related browser navigation code.

chrome/browser/ui/browser.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/browser.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include <windows.h>
 #endif  // OS_WIN
@@ skipping 167 matching lines @@
     "broken_website&format=inproduct&p.page_title=$1&p.page_url=$2";
 
 // The URL for the privacy dashboard.
 const char kPrivacyDashboardUrl[] = "https://www.google.com/dashboard";
 
 // How long we wait before updating the browser chrome while loading a page.
 const int kUIUpdateCoalescingTimeMS = 200;
 
 const char kHashMark[] = "#";
 
-#if defined(OS_CHROMEOS)
-// If a popup window is bigger than this fraction of the screen on chrome os,
-// turn it into a tab
-const float kPopupMaxWidthFactor = 0.5;
-const float kPopupMaxHeightFactor = 0.6;
-#endif
-
 }  // namespace
 
 extern bool g_log_bug53991;
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, Constructors, Creation, Showing:
 
 Browser::Browser(Type type, Profile* profile)
     : type_(type),
       profile_(profile),
@@ skipping 132 matching lines @@
 }
 
 // static
 Browser* Browser::Create(Profile* profile) {
   Browser* browser = new Browser(TYPE_NORMAL, profile);
   browser->InitBrowserWindow();
   return browser;
 }
 
 // static
-Browser* Browser::CreateForPopup(Type type,
-                                 Profile* profile,
-                                 TabContents* new_contents,
-                                 const gfx::Rect& initial_bounds) {
-  DCHECK(type & TYPE_POPUP);
-  Browser* browser = new Browser(type, profile);
-  browser->set_override_bounds(initial_bounds);
-  browser->InitBrowserWindow();
-  TabContentsWrapper* wrapper = new TabContentsWrapper(new_contents);
-  browser->tabstrip_model()->AppendTabContents(wrapper, true);
-  return browser;
-}
-
-// static
 Browser* Browser::CreateForType(Type type, Profile* profile) {
   Browser* browser = new Browser(type, profile);
   browser->InitBrowserWindow();
   return browser;
 }
 
 // static
 Browser* Browser::CreateForApp(const std::string& app_name,
                                const gfx::Size& window_size,
                                Profile* profile,
@@ skipping 757 matching lines @@
     return false;
   controller.GoToIndex(index);
   return true;
 }
 
 browser::NavigateParams Browser::GetSingletonTabNavigateParams(
     const GURL& url) {
   browser::NavigateParams params(this, url, PageTransition::AUTO_BOOKMARK);
   params.disposition = SINGLETON_TAB;
   params.window_action = browser::NavigateParams::SHOW_WINDOW;
+  params.user_gesture = true;
   return params;
 }
 
 void Browser::ShowSingletonTab(const GURL& url) {
   browser::NavigateParams params(GetSingletonTabNavigateParams(url));
   browser::Navigate(&params);
 }
 
 void Browser::UpdateCommandsForFullscreenMode(bool is_fullscreen) {
 #if !defined(OS_MACOSX)
@@ skipping 1717 matching lines @@
                              WindowOpenDisposition disposition,
                              PageTransition::Type transition) {
   browser::NavigateParams params(this, url, transition);
   params.source_contents =
     tabstrip_model()->GetTabContentsAt(
       tabstrip_model()->GetWrapperIndex(source));
   params.referrer = referrer;
   params.disposition = disposition;
   params.tabstrip_add_types = TabStripModel::ADD_NONE;
   params.window_action = browser::NavigateParams::SHOW_WINDOW;
+  params.user_gesture = true;
   browser::Navigate(&params);
 }
 
 void Browser::NavigationStateChanged(const TabContents* source,
                                      unsigned changed_flags) {
   // Only update the UI when something visible has changed.
   if (changed_flags)
     ScheduleUIUpdate(source, changed_flags);
 
   // We don't schedule updates to commands since they will only change once per
   // navigation, so we don't have to worry about flickering.
   if (changed_flags & TabContents::INVALIDATE_URL)
     UpdateCommandsForTabState();
 }
 
 void Browser::AddNewContents(TabContents* source,
                              TabContents* new_contents,
                              WindowOpenDisposition disposition,
                              const gfx::Rect& initial_pos,
                              bool user_gesture) {
   // No code for this yet
   DCHECK(disposition != SAVE_TO_DISK);
   // Can't create a new contents for the current tab - invalid case.
   DCHECK(disposition != CURRENT_TAB);
 
-  // TODO(beng): This belongs behind the platform-specific View interface.
-  //             That's why it's there. http://crbug.com/78853
-#if defined(OS_CHROMEOS)
-  if (disposition == NEW_POPUP) {
-    // If the popup is bigger than a given factor of the screen, then
-    // turn it into a foreground tab (on chrome os only)
-    // Also check for width or height == 0, which would otherwise 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 (initial_pos.width() > max_width || initial_pos.width() == 0 ||
-        initial_pos.height() > max_height || initial_pos.height() == 0) {
-      disposition = NEW_FOREGROUND_TAB;
-    }
-  }
-#endif
-
   TabContentsWrapper* wrapper = new TabContentsWrapper(new_contents);
   browser::NavigateParams params(this, wrapper);
   params.source_contents =
       tabstrip_model()->GetTabContentsAt(
           tabstrip_model()->GetWrapperIndex(source));
   params.disposition = disposition;
   params.window_bounds = initial_pos;
-  // If we create a popup or panel from a non user-gesture, don't activate
-  // the new window / panel.
-  if (disposition == NEW_POPUP && !user_gesture)
-    params.window_action = browser::NavigateParams::SHOW_WINDOW_INACTIVE;
-  else
-    params.window_action = browser::NavigateParams::SHOW_WINDOW;
+  params.window_action = browser::NavigateParams::SHOW_WINDOW;
+  params.user_gesture = user_gesture;
   browser::Navigate(&params);
 }
 
 void Browser::ActivateContents(TabContents* contents) {
   tab_handler_->GetTabStripModel()->ActivateTabAt(
       tab_handler_->GetTabStripModel()->GetWrapperIndex(contents), false);
   window_->Activate();
 }
 
 void Browser::DeactivateContents(TabContents* contents) {
@@ skipping 1469 matching lines @@
     // The page transition below is only for the purpose of inserting the tab.
     browser->AddTab(view_source_contents, PageTransition::LINK);
   }
 
   if (profile_->HasSessionService()) {
     SessionService* session_service = profile_->GetSessionService();
     if (session_service)
       session_service->TabRestored(&view_source_contents->controller(), false);
   }
 }