Change the launcher to create new tabs instead of windows when

chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.cc

 // Copyright (c) 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/ash/launcher/chrome_launcher_delegate.h"
 
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_types.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.h"
 #include "chrome/browser/ui/views/ash/launcher/launcher_context_menu.h"
 #include "chrome/browser/ui/views/ash/launcher/launcher_updater.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/pref_names.h"
@@ skipping 281 matching lines @@
 void ChromeLauncherDelegate::UnpinAppsWithID(const std::string& app_id) {
   for (IDToItemMap::iterator i = id_to_item_map_.begin();
        i != id_to_item_map_.end(); ) {
     IDToItemMap::iterator current(i);
     ++i;
     if (current->second.app_id == app_id && IsPinned(current->first))
       Unpin(current->first);
   }
 }
 
-void ChromeLauncherDelegate::CreateNewWindow() {
-  Browser::NewEmptyWindow(GetProfileForNewWindows());
+void ChromeLauncherDelegate::CreateNewTab() {
+  Browser *last_browser = BrowserList::FindTabbedBrowser(
+      GetProfileForNewWindows(), true);
+
+  if (last_browser) {
+    last_browser->NewTab();
+    aura::Window* window = last_browser->window()->GetNativeHandle();
+    window->Show();
+    ash::wm::ActivateWindow(window);
+  } else {
+    Browser::NewEmptyWindow(GetProfileForNewWindows());
+  }
 }
 
 void ChromeLauncherDelegate::ItemClicked(const ash::LauncherItem& item) {
   DCHECK(id_to_item_map_.find(item.id) != id_to_item_map_.end());
   Open(item.id);
 }
 
 int ChromeLauncherDelegate::GetBrowserShortcutResourceId() {
   return IDR_PRODUCT_LOGO_32;
 }
@@ skipping 102 matching lines @@
   }
 }
 
 void ChromeLauncherDelegate::SetAppIconLoaderForTest(AppIconLoader* loader) {
   app_icon_loader_.reset(loader);
 }
 
 Profile* ChromeLauncherDelegate::GetProfileForNewWindows() {
   return ProfileManager::GetDefaultProfileOrOffTheRecord();
 }