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