Clean up some style and organization in the browser about handler. No code...

chrome/browser/tab_contents/navigation_controller.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/navigation_controller.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
+#include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/dom_ui/dom_ui_host.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/repost_form_warning.h"
 #include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/common/navigation_types.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/resource_bundle.h"
@@ skipping 28 matching lines @@
 //
 // An empty state is treated as a new navigation by WebKit, which would mean
 // losing the navigation entries and generating a new navigation entry after
 // this one. We don't want that. To avoid this we create a valid state which
 // WebKit will not treat as a new navigation.
 void SetContentStateIfEmpty(NavigationEntry* entry) {
   if (entry->content_state().empty() &&
       (entry->tab_type() == TAB_CONTENTS_WEB ||
        entry->tab_type() == TAB_CONTENTS_NEW_TAB_UI ||
        entry->tab_type() == TAB_CONTENTS_DOM_UI ||
-       entry->tab_type() == TAB_CONTENTS_ABOUT_UI ||
        entry->tab_type() == TAB_CONTENTS_HTML_DIALOG ||
        entry->IsViewSourceMode())) {
     entry->set_content_state(
         webkit_glue::CreateHistoryStateForURL(entry->url()));
   }
 }
 
 // Configure all the NavigationEntries in entries for restore. This resets
 // the transition type to reload and makes sure the content state isn't empty.
 void ConfigureEntriesForRestore(
@@ skipping 171 matching lines @@
   }
 }
 
 NavigationEntry* NavigationController::GetEntryWithPageID(
     TabContentsType type, SiteInstance* instance, int32 page_id) const {
   int index = GetEntryIndexWithPageID(type, instance, page_id);
   return (index != -1) ? entries_[index].get() : NULL;
 }
 
 void NavigationController::LoadEntry(NavigationEntry* entry) {
+  // Handle non-navigational URLs that popup dialogs and such, these should not
+  // actually navigate.
+  if (HandleNonNavigationAboutURL(entry->url()))
+    return;
+
   // When navigating to a new page, we don't know for sure if we will actually
   // end up leaving the current page.  The new page load could for example
   // result in a download or a 'no content' response (e.g., a mailto: URL).
   DiscardNonCommittedEntriesInternal();
   pending_entry_ = entry;
   NotificationService::current()->Notify(
       NotificationType::NAV_ENTRY_PENDING,
       Source<NavigationController>(this),
       NotificationService::NoDetails());
   NavigateToPendingEntry(false);
@@ skipping 196 matching lines @@
     delete this;
 }
 
 NavigationEntry* NavigationController::CreateNavigationEntry(
     const GURL& url, const GURL& referrer, PageTransition::Type transition) {
   GURL real_url = url;
   TabContentsType type;
 
   // If the active contents supports |url|, use it.
   // Note: in both cases, we give TabContents a chance to rewrite the URL.
+  //
+  // TODO(brettw): The BrowserURLHandler::HandleBrowserURL call should just be
+  // moved here from inside TypeForURL once the tab contents types are removed.
   TabContents* active = active_contents();
   if (active && active->SupportsURL(&real_url))
     type = active->type();
   else
     type = TabContents::TypeForURL(&real_url);
-
-  if (url.SchemeIs(chrome::kViewSourceScheme)) {
-    // Load the inner URL instead, setting the original URL as the "display".
-    real_url = GURL(url.path());
-  }
-
+  
   NavigationEntry* entry = new NavigationEntry(type, NULL, -1, real_url,
                                                referrer,
                                                string16(), transition);
   entry->set_display_url(url);
   entry->set_user_typed_url(url);
   if (url.SchemeIsFile()) {
     entry->set_title(WideToUTF16Hack(
         file_util::GetFilenameFromPath(UTF8ToWide(url.host() + url.path()))));
   }
   return entry;
@@ skipping 739 matching lines @@
       return i;
   }
   return -1;
 }
 
 NavigationEntry* NavigationController::GetTransientEntry() const {
   if (transient_entry_index_ == -1)
     return NULL;
   return entries_[transient_entry_index_].get();
 }