diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-16 21:00:48 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-16 21:00:48 +0000 |
| commit | 447c79c28fa36d23081359920e45c810eca94dfe (patch) | |
| tree | ce29d19af3d2a745019ee9f10e387c27e1860936 /chrome/browser/navigation_controller.h | |
| parent | e57d57f04228aee2cfe96a598669f8e0b1662f09 (diff) | |
| download | chromium_src-447c79c28fa36d23081359920e45c810eca94dfe.zip chromium_src-447c79c28fa36d23081359920e45c810eca94dfe.tar.gz chromium_src-447c79c28fa36d23081359920e45c810eca94dfe.tar.bz2 | |
Remove the rest of the alternate nav url fetcher from the navigation controller.
This changes the memory model around a bit, and it's not the most clear thing
ever, not that it was before. The alternate URL fetcher is now responsible for
deleting itself in most cases.
BUG=2370 (Assertion when using the alternate URL tracker twice in a row)
BUG=1324500 (Move the AlternateNavURLFetcher logic out of NavigationController)
Review URL: http://codereview.chromium.org/2905
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2279 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/navigation_controller.h')
| -rw-r--r-- | chrome/browser/navigation_controller.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/chrome/browser/navigation_controller.h b/chrome/browser/navigation_controller.h index f099704..3380732f 100644 --- a/chrome/browser/navigation_controller.h +++ b/chrome/browser/navigation_controller.h @@ -9,7 +9,6 @@ #include "base/linked_ptr.h" #include "base/ref_counted.h" -#include "chrome/browser/alternate_nav_url_fetcher.h" #include "chrome/browser/session_service.h" #include "chrome/browser/site_instance.h" #include "chrome/browser/ssl_manager.h" @@ -311,10 +310,6 @@ class NavigationController { const std::wstring& GetLazyTitle() const; const SkBitmap& GetLazyFavIcon() const; - // TODO(brettw) bug 1324500: move this out of here. - void SetAlternateNavURLFetcher( - AlternateNavURLFetcher* alternate_nav_url_fetcher); - // Returns the identifier used by session restore. const SessionID& session_id() const { return session_id_; } @@ -512,10 +507,6 @@ class NavigationController { // The tab contents that is currently active. TabContents* active_contents_; - // The AlternateNavURLFetcher and its associated active entry, if any. - scoped_ptr<AlternateNavURLFetcher> alternate_nav_url_fetcher_; - int alternate_nav_url_fetcher_entry_unique_id_; - // The max restored page ID in this controller, if it was restored. We must // store this so that WebContents can tell any renderer in charge of one of // the restored entries to update its max page ID. |