OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/tab_contents/navigation_controller.h" | 5 #include "chrome/browser/tab_contents/navigation_controller.h" |
6 | 6 |
7 #include "app/resource_bundle.h" | |
8 #include "base/file_util.h" | 7 #include "base/file_util.h" |
9 #include "base/logging.h" | 8 #include "base/logging.h" |
10 #include "base/string_util.h" | 9 #include "base/string_util.h" |
11 #include "base/time.h" | 10 #include "base/time.h" |
12 #include "chrome/browser/browser_about_handler.h" | 11 #include "chrome/browser/browser_about_handler.h" |
13 #include "chrome/browser/browser_process.h" | 12 #include "chrome/browser/browser_process.h" |
14 #include "chrome/browser/browser_url_handler.h" | 13 #include "chrome/browser/browser_url_handler.h" |
15 #include "chrome/browser/in_process_webkit/dom_storage_context.h" | 14 #include "chrome/browser/in_process_webkit/dom_storage_context.h" |
16 #include "chrome/browser/in_process_webkit/webkit_context.h" | 15 #include "chrome/browser/in_process_webkit/webkit_context.h" |
17 #include "chrome/browser/pref_service.h" | 16 #include "chrome/browser/pref_service.h" |
(...skipping 1122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1140 return i; | 1139 return i; |
1141 } | 1140 } |
1142 return -1; | 1141 return -1; |
1143 } | 1142 } |
1144 | 1143 |
1145 NavigationEntry* NavigationController::GetTransientEntry() const { | 1144 NavigationEntry* NavigationController::GetTransientEntry() const { |
1146 if (transient_entry_index_ == -1) | 1145 if (transient_entry_index_ == -1) |
1147 return NULL; | 1146 return NULL; |
1148 return entries_[transient_entry_index_].get(); | 1147 return entries_[transient_entry_index_].get(); |
1149 } | 1148 } |
OLD | NEW |