diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-19 02:27:16 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-19 02:27:16 +0000 |
commit | 299dabdd2178ac3126282ac854da86b6cd84be02 (patch) | |
tree | 4626d596651704ec7b467d60c011da7efe18dcda /chrome/browser/navigation_controller.cc | |
parent | 2758136c0f073eacbb2943d5029b90eb4b1e5512 (diff) | |
download | chromium_src-299dabdd2178ac3126282ac854da86b6cd84be02.zip chromium_src-299dabdd2178ac3126282ac854da86b6cd84be02.tar.gz chromium_src-299dabdd2178ac3126282ac854da86b6cd84be02.tar.bz2 |
Land this change again now I've fixed the crash.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5669 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/navigation_controller.cc')
-rw-r--r-- | chrome/browser/navigation_controller.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/navigation_controller.cc b/chrome/browser/navigation_controller.cc index 9f9cf68..c646b4a 100644 --- a/chrome/browser/navigation_controller.cc +++ b/chrome/browser/navigation_controller.cc @@ -8,18 +8,19 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/string_util.h" -#include "chrome/common/navigation_types.h" -#include "chrome/common/resource_bundle.h" -#include "chrome/common/scoped_vector.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/dom_ui/dom_ui_host.h" #include "chrome/browser/navigation_entry.h" #include "chrome/browser/profile.h" #include "chrome/browser/repost_form_warning_dialog.h" +#include "chrome/browser/session_service.h" #include "chrome/browser/site_instance.h" #include "chrome/browser/tab_contents.h" #include "chrome/browser/tab_contents_delegate.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/navigation_types.h" +#include "chrome/common/resource_bundle.h" +#include "chrome/common/scoped_vector.h" #include "net/base/net_util.h" #include "webkit/glue/webkit_glue.h" |