Remove old web app code it's no longer needed. Simplifies startup a little.

chrome/browser/browser.cc

 // Copyright (c) 2006-2008 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 "base/command_line.h"
 #include "base/idle_timer.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 291 matching lines @@
       off_the_record_profile,
       TYPE_NORMAL);
   if (!browser)
     browser = Browser::Create(off_the_record_profile);
   // TODO(eroman): should we have referrer here?
   browser->AddTabWithURL(url, GURL(), PageTransition::LINK, true, NULL);
   browser->window()->Show();
 }
 
 // static
-void Browser::OpenWebApplication(Profile* profile, WebApp* app) {
-#if defined(OS_WIN)
-  const std::wstring& app_name =
-      app->name().empty() ? ComputeApplicationNameFromURL(app->url()) :
-                            app->name();
+void Browser::OpenApplicationWindow(Profile* profile, const GURL& url) {
+  const std::wstring& app_name = ComputeApplicationNameFromURL(url);

[brettw, 2009/02/02 06:26:46]

While not wrong, I think this is better as a std::wstring rather than a const
ref. Since the function returns a real string, you're not saving anything.

   RegisterAppPrefs(app_name);
 
   Browser* browser = Browser::CreateForApp(app_name, profile);
-  browser->AddWebApplicationTab(profile, app, false);
+  browser->AddTabWithURL(url, GURL(), PageTransition::START_PAGE, true, NULL);
   browser->window()->Show();
-#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, State Storage and Retrieval for UI:
 
 std::wstring Browser::GetWindowPlacementKey() const {
   std::wstring name(prefs::kBrowserWindowPlacement);
   if (!app_name_.empty()) {
     name.append(L"_");
     name.append(app_name_);
@@ skipping 149 matching lines @@
       CreateTabContentsForURL(url_to_load, referrer, profile_, transition,
                               false, instance);
   tabstrip_model_.AddTabContents(contents, -1, transition, foreground);
   // By default, content believes it is not hidden.  When adding contents
   // in the background, tell it that it's hidden.
   if (!foreground)
     contents->WasHidden();
   return contents;
 }
 
-#if defined(OS_WIN)
-
-TabContents* Browser::AddWebApplicationTab(Profile* profile,
-                                           WebApp* web_app,
-                                           bool lazy) {
-  DCHECK(web_app);
-
-  // TODO(acw): Do we need an "application launched" transition type?
-  // TODO(creis): Should we reuse the current instance (ie. process) here?
-  TabContents* contents =
-      CreateTabContentsForURL(web_app->url(), GURL(), profile,
-                              PageTransition::LINK, lazy, NULL);
-  WebContents* web_contents = contents->AsWebContents();
-  if (web_contents)
-    web_contents->SetWebApp(web_app);
-
-  if (lazy) {
-    contents->controller()->LoadURLLazily(
-        web_app->url(), GURL(), PageTransition::LINK, web_app->name(), NULL);
-  }
-  tabstrip_model_.AddTabContents(contents, -1, PageTransition::LINK, !lazy);
-  return contents;
-}
-
-#endif
-
 TabContents* Browser::AddTabWithNavigationController(
     NavigationController* ctrl, PageTransition::Type type) {
   TabContents* tc = ctrl->active_contents();
   tabstrip_model_.AddTabContents(tc, -1, type, true);
   return tc;
 }
 
 #if defined(OS_WIN)
 
 NavigationController* Browser::AddRestoredTab(
@@ skipping 1297 matching lines @@
 
 void Browser::ContentsZoomChange(bool zoom_in) {
   ExecuteCommand(zoom_in ? IDC_ZOOM_PLUS : IDC_ZOOM_MINUS);
 }
 
 bool Browser::IsApplication() const {
   return type_ == TYPE_APP;
 }
 
 void Browser::ConvertContentsToApplication(TabContents* contents) {
-  WebContents* web_contents = contents->AsWebContents();
-  if (!web_contents || !web_contents->web_app()) {
-    NOTREACHED();
-    return;
-  }
-
   int index = tabstrip_model_.GetIndexOfTabContents(contents);
   if (index < 0)
     return;
 
-  WebApp* app = web_contents->web_app();
-  const std::wstring& app_name = app->name().empty() ?
-      ComputeApplicationNameFromURL(app->url()) : app->name();
+  const GURL& url = contents->controller()->GetActiveEntry()->url();
+  const std::wstring& app_name = ComputeApplicationNameFromURL(url);

[brettw, 2009/02/02 06:26:46]

Same string comment.

   RegisterAppPrefs(app_name);
 
   tabstrip_model_.DetachTabContentsAt(index);
   Browser* browser = Browser::CreateForApp(app_name, profile_);
   browser->tabstrip_model()->AppendTabContents(contents, true);
   browser->window()->Show();
 }
 
 void Browser::ContentsStateChanged(TabContents* source) {
   int index = tabstrip_model_.GetIndexOfTabContents(source);
@@ skipping 583 matching lines @@
 
 void Browser::AdvanceFindSelection(bool forward_direction) {
   GetSelectedTabContents()->AsWebContents()->view()->FindInPage(
       *this, true, forward_direction);
 }
 
 void Browser::CloseFrame() {
   window_->Close();
 }
 
+#endif  // OS_WIN
+
 // static
 std::wstring Browser::ComputeApplicationNameFromURL(const GURL& url) {
   std::string t;
   t.append(url.host());
   t.append("_");
   t.append(url.path());
   return UTF8ToWide(t);
 }
 
 // static
@@ skipping 11 matching lines @@
 
   // We need to register the window position pref.
   std::wstring window_pref(prefs::kBrowserWindowPlacement);
   window_pref.append(L"_");
   window_pref.append(app_name);
   PrefService* prefs = g_browser_process->local_state();
   DCHECK(prefs);
 
   prefs->RegisterDictionaryPref(window_pref.c_str());
 }
-
-#endif  // OS_WIN