OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_ | 5 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_ |
6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_ | 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_ |
7 | 7 |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/gtest_prod_util.h" | 10 #include "base/gtest_prod_util.h" |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 // Sets the screenshot manager for this NavigationControllerImpl. The | 201 // Sets the screenshot manager for this NavigationControllerImpl. The |
202 // controller takes ownership of the screenshot manager and destroys it when | 202 // controller takes ownership of the screenshot manager and destroys it when |
203 // a new screenshot-manager is set, or when the controller is destroyed. | 203 // a new screenshot-manager is set, or when the controller is destroyed. |
204 // Setting a NULL manager recreates the default screenshot manager and uses | 204 // Setting a NULL manager recreates the default screenshot manager and uses |
205 // that. | 205 // that. |
206 void SetScreenshotManager(NavigationEntryScreenshotManager* manager); | 206 void SetScreenshotManager(NavigationEntryScreenshotManager* manager); |
207 | 207 |
208 // Discards only the pending entry. | 208 // Discards only the pending entry. |
209 void DiscardPendingEntry(); | 209 void DiscardPendingEntry(); |
210 | 210 |
| 211 // Produces a redirect chain by merging the active entry redirects with the |
| 212 // redirects given in the params, taking into account the type of navigation |
| 213 // specified in the params. |
| 214 std::vector<GURL> GetMergedRedirectChain( |
| 215 const ViewHostMsg_FrameNavigate_Params& params, |
| 216 const std::vector<GURL>& active_entry_redirects) const; |
| 217 |
211 private: | 218 private: |
212 friend class RestoreHelper; | 219 friend class RestoreHelper; |
213 | 220 |
214 FRIEND_TEST_ALL_PREFIXES(NavigationControllerTest, | 221 FRIEND_TEST_ALL_PREFIXES(NavigationControllerTest, |
215 PurgeScreenshot); | 222 PurgeScreenshot); |
216 FRIEND_TEST_ALL_PREFIXES(TimeSmoother, Basic); | 223 FRIEND_TEST_ALL_PREFIXES(TimeSmoother, Basic); |
217 FRIEND_TEST_ALL_PREFIXES(TimeSmoother, SingleDuplicate); | 224 FRIEND_TEST_ALL_PREFIXES(TimeSmoother, SingleDuplicate); |
218 FRIEND_TEST_ALL_PREFIXES(TimeSmoother, ManyDuplicates); | 225 FRIEND_TEST_ALL_PREFIXES(TimeSmoother, ManyDuplicates); |
219 FRIEND_TEST_ALL_PREFIXES(TimeSmoother, ClockBackwardsJump); | 226 FRIEND_TEST_ALL_PREFIXES(TimeSmoother, ClockBackwardsJump); |
220 | 227 |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
413 TimeSmoother time_smoother_; | 420 TimeSmoother time_smoother_; |
414 | 421 |
415 scoped_ptr<NavigationEntryScreenshotManager> screenshot_manager_; | 422 scoped_ptr<NavigationEntryScreenshotManager> screenshot_manager_; |
416 | 423 |
417 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl); | 424 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl); |
418 }; | 425 }; |
419 | 426 |
420 } // namespace content | 427 } // namespace content |
421 | 428 |
422 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_ | 429 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_ |
OLD | NEW |