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

chrome/browser/tab_contents/web_contents.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 "chrome/browser/tab_contents/web_contents.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_version_info.h"
 #include "base/process_util.h"
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/autofill_manager.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/cache_manager_host.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_request_manager.h"
+#include "chrome/browser/gears_integration.h"
 #include "chrome/browser/google_util.h"
 #include "chrome/browser/js_before_unload_handler.h"
 #include "chrome/browser/jsmessage_box_handler.h"
 #include "chrome/browser/load_from_memory_cache_details.h"
 #include "chrome/browser/load_notification_details.h"
 #include "chrome/browser/modal_html_dialog_delegate.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/plugin_installer.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/printing/print_job.h"
@@ skipping 178 matching lines @@
       this, NotificationType::URLS_STARRED, NotificationService::AllSources());
   NotificationService::current()->AddObserver(
       this, NotificationType::BOOKMARK_MODEL_LOADED,
       NotificationService::AllSources());
   NotificationService::current()->AddObserver(
       this, NotificationType::RENDER_WIDGET_HOST_DESTROYED,
       NotificationService::AllSources());
 }
 
 WebContents::~WebContents() {
-  if (web_app_.get())
-    web_app_->RemoveObserver(this);
   if (pending_install_.callback_functor)
     pending_install_.callback_functor->Cancel();
   NotificationService::current()->RemoveObserver(
       this, NotificationType::RENDER_WIDGET_HOST_DESTROYED,
       NotificationService::AllSources());
 }
 
 // static
 void WebContents::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, true);
@@ skipping 92 matching lines @@
   NotifyDisconnected();
   HungRendererWarning::HideForWebContents(this);
   render_manager_.Shutdown();
   TabContents::Destroy();
 }
 
 SiteInstance* WebContents::GetSiteInstance() const {
   return render_manager_.current_host()->site_instance();
 }
 
-SkBitmap WebContents::GetFavIcon() {
-  if (web_app_.get() && IsWebApplicationActive()) {
-    SkBitmap app_icon = web_app_->GetFavIcon();
-    if (!app_icon.isNull())
-      return app_icon;
-  }
-  return TabContents::GetFavIcon();
-}
-
 std::wstring WebContents::GetStatusText() const {
   if (!is_loading() || load_state_ == net::LOAD_STATE_IDLE)
     return std::wstring();
 
   switch (load_state_) {
     case net::LOAD_STATE_WAITING_FOR_CACHE:
       return l10n_util::GetString(IDS_LOAD_STATE_WAITING_FOR_CACHE);
     case net::LOAD_STATE_RESOLVING_PROXY_FOR_URL:
       return l10n_util::GetString(IDS_LOAD_STATE_RESOLVING_PROXY_FOR_URL);
     case net::LOAD_STATE_RESOLVING_HOST:
@@ skipping 141 matching lines @@
 HWND WebContents::GetContainerHWND() const {
   return view_->GetNativeView();
 }
 HWND WebContents::GetContentHWND() {
   return view_->GetContentNativeView();
 }
 void WebContents::GetContainerBounds(gfx::Rect *out) const {
   view_->GetContainerBounds(out);
 }
 
-void WebContents::SetWebApp(WebApp* web_app) {
-  if (web_app_.get()) {
-    web_app_->RemoveObserver(this);
-    web_app_->SetWebContents(NULL);
-  }
-
-  web_app_ = web_app;
-  if (web_app) {
-    web_app->AddObserver(this);
-    web_app_->SetWebContents(this);
-  }
-}
-
-bool WebContents::IsWebApplication() const {
-  return (web_app_.get() != NULL);
-}
-
 void WebContents::CreateShortcut() {
   NavigationEntry* entry = controller()->GetLastCommittedEntry();
   if (!entry)
     return;
 
   // We only allow one pending install request. By resetting the page id we
   // effectively cancel the pending install request.
   pending_install_.page_id = entry->page_id();
   pending_install_.icon = GetFavIcon();
   pending_install_.title = GetTitle();
@@ skipping 405 matching lines @@
     bool errored,
     const SkBitmap& image) {
   // A notification for downloading would be more flexible, but for now I'm
   // forwarding to the two places that could possibly have initiated the
   // request. If we end up with another place invoking DownloadImage, probably
   // best to refactor out into notification service, or something similar.
   if (errored)
     fav_icon_helper_.FavIconDownloadFailed(id);
   else
     fav_icon_helper_.SetFavIcon(id, image_url, image);
-  if (web_app_.get() && !errored)
-    web_app_->SetImage(image_url, image);
 }
 
 void WebContents::RequestOpenURL(const GURL& url, const GURL& referrer,
                                  WindowOpenDisposition disposition) {
   OpenURL(url, referrer, disposition, PageTransition::LINK);
 }
 
 void WebContents::DomOperationResponse(const std::string& json_string,
                                        int automation_id) {
   DomOperationNotificationDetails details(json_string, automation_id);
@@ skipping 581 matching lines @@
 
 void WebContents::UpdateAlternateErrorPageURL() {
   GURL url = GetAlternateErrorPageURL();
   render_view_host()->SetAlternateErrorPageURL(url);
 }
 
 void WebContents::UpdateWebPreferences() {
   render_view_host()->UpdateWebPreferences(GetWebkitPrefs());
 }
 
-bool WebContents::IsWebApplicationActive() const {
-  if (!web_app_.get())
-    return false;
-
-  // If we are inside an application, the application is always active. For
-  // example, this allows us to display the GMail icon even when we are bounced
-  // the login page.
-  if (delegate() && delegate()->IsApplication())
-    return true;
-
-  return (GetURL() == web_app_->url());
-}
-
-void WebContents::WebAppImagesChanged(WebApp* web_app) {
-  DCHECK(web_app == web_app_.get());
-  if (delegate() && IsWebApplicationActive())
-    delegate()->NavigationStateChanged(this, TabContents::INVALIDATE_FAVICON);
-}
-
 void WebContents::OnGearsCreateShortcutDone(
     const GearsShortcutData& shortcut_data, bool success) {
   NavigationEntry* current_entry = controller()->GetLastCommittedEntry();
   bool same_page =
       current_entry && pending_install_.page_id == current_entry->page_id();
 
   if (success && same_page) {
     // Only switch to app mode if the user chose to create a shortcut and
     // we're still on the same page that it corresponded to.
-    SetWebApp(new WebApp(profile(), shortcut_data));
     if (delegate())
       delegate()->ConvertContentsToApplication(this);
   }
 
   // Reset the page id to indicate no requests are pending.
   pending_install_.page_id = 0;
   pending_install_.callback_functor = NULL;
 }
 
 void WebContents::UpdateMaxPageIDIfNecessary(SiteInstance* site_instance,
@@ skipping 183 matching lines @@
     // The favicon url isn't valid. This means there really isn't a favicon,
     // or the favicon url wasn't obtained before the load started. This assumes
     // the later.
     // TODO(sky): Need a way to set the favicon that doesn't involve generating
     // its url.
     new_url->SetFavIconURL(TemplateURL::GenerateFaviconURL(params.referrer));
   }
   new_url->set_safe_for_autoreplace(true);
   url_model->Add(new_url);
 }