diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 22:45:34 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 22:45:34 +0000 |
| commit | b689fce776a394377fed51ae063942509a2988a1 (patch) | |
| tree | eb52e9944db424e9e1b80bcefe9b9b96b1c27b50 /chrome/browser/tab_contents/navigation_controller.cc | |
| parent | 84ae20cba3059760948ca5d1f313dc25c74b26d6 (diff) | |
| download | chromium_src-b689fce776a394377fed51ae063942509a2988a1.zip chromium_src-b689fce776a394377fed51ae063942509a2988a1.tar.gz chromium_src-b689fce776a394377fed51ae063942509a2988a1.tar.bz2 | |
Merge DOMUIContents into WebContents.
I did a lot of cleanup of the DOM UI system as part of this.
Review URL: http://codereview.chromium.org/42227
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/navigation_controller.cc')
| -rw-r--r-- | chrome/browser/tab_contents/navigation_controller.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/tab_contents/navigation_controller.cc b/chrome/browser/tab_contents/navigation_controller.cc index 263a5ce..38dafb6d 100644 --- a/chrome/browser/tab_contents/navigation_controller.cc +++ b/chrome/browser/tab_contents/navigation_controller.cc @@ -7,6 +7,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/string_util.h" +#include "base/time.h" #include "chrome/browser/browser_about_handler.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/dom_ui/dom_ui_host.h" @@ -54,7 +55,6 @@ void NotifyPrunedEntries(NavigationController* nav_controller, void SetContentStateIfEmpty(NavigationEntry* entry) { if (entry->content_state().empty() && (entry->tab_type() == TAB_CONTENTS_WEB || - entry->tab_type() == TAB_CONTENTS_DOM_UI || entry->tab_type() == TAB_CONTENTS_HTML_DIALOG || entry->IsViewSourceMode())) { entry->set_content_state( |