Beginnings of a new InfoBar system.

chrome/browser/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/web_contents.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_version_info.h"
 #include "base/process_util.h"
@@ skipping 1320 matching lines @@
   DCHECK(!plugin_path.empty());
 
   std::wstring plugin_name = plugin_path;
   scoped_ptr<FileVersionInfo> version_info(
       FileVersionInfo::CreateFileVersionInfo(plugin_path));
   if (version_info.get()) {
     const std::wstring& product_name = version_info->product_name();
     if (!product_name.empty())
       plugin_name = product_name;
   }
-  view_->DisplayErrorInInfoBar(
-      l10n_util::GetStringF(IDS_PLUGIN_CRASHED_PROMPT, plugin_name));
+  AddInfoBar(new SimpleAlertInfoBarDelegate(
+      l10n_util::GetStringF(IDS_PLUGIN_CRASHED_PROMPT, plugin_name), NULL));
 }
 
 void WebContents::OnJSOutOfMemory() {
-  view_->DisplayErrorInInfoBar(
-      l10n_util::GetString(IDS_JS_OUT_OF_MEMORY_PROMPT));
+  AddInfoBar(new SimpleAlertInfoBarDelegate(
+      l10n_util::GetString(IDS_JS_OUT_OF_MEMORY_PROMPT), NULL));
 }
 
 bool WebContents::CanBlur() const {
   return delegate() ? delegate()->CanBlur() : true;
 }
 
 void WebContents::RendererUnresponsive(RenderViewHost* rvh, 
                                        bool is_during_unload) {
   if (is_during_unload) {
     // Hang occurred while firing the beforeunload/unload handler.
@@ skipping 112 matching lines @@
       } else if (*pref_name_in == prefs::kDefaultCharset ||
           StartsWithASCII(WideToUTF8(*pref_name_in), "webkit.webprefs.", true)
           ) {
         UpdateWebPreferences();
       } else {
         NOTREACHED() << "unexpected pref change notification" << *pref_name_in;
       }
       break;
     }
     default: {
-      NOTREACHED();
+      TabContents::Observe(type, source, details);
       break;
     }
   }
 }
 
 void WebContents::DidNavigateMainFramePostCommit(
     const NavigationController::LoadCommittedDetails& details,
     const ViewHostMsg_FrameNavigate_Params& params) {
   // Hide the download shelf if all the following conditions are true:
   // - there are no active downloads.
@@ skipping 342 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);
 }