Merge 48149 - Relanding 48042....

chrome/browser/browser.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/browser.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include <windows.h>
 #endif  // OS_WIN
@@ skipping 1034 matching lines @@
   command_updater_.UpdateCommandEnabled(IDC_EDIT_SEARCH_ENGINES, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_VIEW_PASSWORDS, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_ABOUT, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_SHOW_APP_MENU, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_SHOW_PAGE_MENU, show_main_ui);
 }
 
 bool Browser::OpenAppsPanelAsNewTab() {
 #if defined(OS_CHROMEOS) || defined(OS_WIN)
   CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kDisableAppsPanel) ||
-      (!browser_defaults::kShowAppsPanelForNewTab &&
-           !command_line->HasSwitch(switches::kAppsPanel))) {
-    return false;
+  if (command_line->HasSwitch(switches::kAppsPanel)) {
+    AppLauncher::ShowForNewTab(this, std::string());
+    return true;
   }
-  AppLauncher::ShowForNewTab(this, std::string());
-  return true;
-#endif  // OS_CHROMEOS || OS_WIN
-
+#endif
   return false;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, Assorted browser commands:
 
 bool Browser::ShouldOpenNewTabForWindowDisposition(
     WindowOpenDisposition disposition) {
   return (disposition == NEW_FOREGROUND_TAB ||
           disposition == NEW_BACKGROUND_TAB);
@@ skipping 998 matching lines @@
 // Browser, CommandUpdater::CommandUpdaterDelegate implementation:
 
 void Browser::ExecuteCommand(int id) {
   ExecuteCommandWithDisposition(id, CURRENT_TAB);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, TabStripModelDelegate implementation:
 
 TabContents* Browser::AddBlankTab(bool foreground) {
-  // To make a more "launchy" experience, try to reuse an existing NTP if there
-  // is one.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableApps)) {
-    for (int i = tabstrip_model_.count() - 1; i >= 0; --i) {
-      TabContents* contents = tabstrip_model_.GetTabContentsAt(i);
-      if (StartsWithASCII(contents->GetURL().spec(),
-                          chrome::kChromeUINewTabURL, true)) {
-        if (foreground)
-          SelectTabContentsAt(i, true);
-
-        return contents;
-      }
-    }
-  }
-
   return AddBlankTabAt(-1, foreground);
 }
 
 TabContents* Browser::AddBlankTabAt(int index, bool foreground) {
   // Time new tab page creation time.  We keep track of the timing data in
   // TabContents, but we want to include the time it takes to create the
   // TabContents object too.
   base::TimeTicks new_tab_start_time = base::TimeTicks::Now();
   TabContents* tab_contents = AddTabWithURL(
       GURL(chrome::kChromeUINewTabURL), GURL(), PageTransition::TYPED, index,
@@ skipping 1751 matching lines @@
   if (TabHasUnloadListener(contents)) {
     // If the page has unload listeners, then we tell the renderer to fire
     // them. Once they have fired, we'll get a message back saying whether
     // to proceed closing the page or not, which sends us back to this method
     // with the HasUnloadListener bit cleared.
     contents->render_view_host()->FirePageBeforeUnload(false);
     return true;
   }
   return false;
 }