Revert 60997 - o Add user customizable launch type for apps by adding options...

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 29 matching lines @@
 #include "chrome/browser/dom_ui/filebrowse_ui.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/download/download_started_animation.h"
 #include "chrome/browser/extensions/crashed_extension_infobar.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_disabled_infobar_delegate.h"
 #include "chrome/browser/extensions/extension_host.h"
-#include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/find_bar.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/host_zoom_map.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ skipping 489 matching lines @@
                                             GURL& url, Browser** browser) {
   return OpenApplicationWindow(profile, NULL, extension_misc::LAUNCH_WINDOW,
                                url, browser);
 }
 
 // static
 TabContents* Browser::OpenApplicationTab(Profile* profile,
                                          Extension* extension,
                                          Browser** browser) {
   Browser* local_browser = BrowserList::GetLastActiveWithProfile(profile);
-  TabContents* tab_contents = NULL;
   if (!local_browser || local_browser->type() != Browser::TYPE_NORMAL)
-    return tab_contents;
+    return NULL;
 
-  // Check the prefs for overridden mode.
-  ExtensionsService* extensions_service = profile->GetExtensionsService();
-  DCHECK(extensions_service);
+  // TODO(erikkay): This doesn't seem like the right transition in all cases.
+  PageTransition::Type transition = PageTransition::START_PAGE;
 
-  ExtensionPrefs::LaunchType launch_type =
-      extensions_service->extension_prefs()->GetLaunchType(extension->id());
-  int add_type = TabStripModel::ADD_SELECTED;
-  if (launch_type == ExtensionPrefs::LAUNCH_PINNED)
-    add_type |= TabStripModel::ADD_PINNED;
-
-  // TODO(erikkay): START_PAGE doesn't seem like the right transition in all
-  // cases.
-  tab_contents = local_browser->AddTabWithURL(extension->GetFullLaunchURL(),
-      GURL(), PageTransition::START_PAGE, -1, add_type, NULL, "", browser);
-  if (launch_type == ExtensionPrefs::LAUNCH_FULLSCREEN)
-    local_browser->window()->SetFullscreen(true);
-
-  return tab_contents;
+  return local_browser->AddTabWithURL(
+      extension->GetFullLaunchURL(), GURL(), transition, -1,
+      TabStripModel::ADD_PINNED | TabStripModel::ADD_SELECTED,
+      NULL, "", browser);
 }
 
 // static
 void Browser::OpenBookmarkManagerWindow(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   browser->ShowBookmarkManagerTab();
   browser->window()->Show();
 }
 
 #if defined(OS_MACOSX)
@@ skipping 3553 matching lines @@
         disposition == NEW_FOREGROUND_TAB ? TabStripModel::ADD_SELECTED :
                                             TabStripModel::ADD_NONE);
     return true;
   }
   // The omnibox currently doesn't use other dispositions, so we don't attempt
   // to handle them. If you hit this NOTREACHED file a bug and I'll (sky) add
   // support for the new disposition.
   NOTREACHED();
   return false;
 }