| Index: content/browser/frame_host/navigation_controller_impl.h
|
| diff --git a/content/browser/frame_host/navigation_controller_impl.h b/content/browser/frame_host/navigation_controller_impl.h
|
| index eb566c203181a1c02389f9642bfaeadab9abe363..99fc36ae00209adf8958624d920b82ce251c5d6c 100644
|
| --- a/content/browser/frame_host/navigation_controller_impl.h
|
| +++ b/content/browser/frame_host/navigation_controller_impl.h
|
| @@ -88,8 +88,8 @@ class CONTENT_EXPORT NavigationControllerImpl
|
| int index) OVERRIDE;
|
| virtual void CopyStateFrom(
|
| const NavigationController& source) OVERRIDE;
|
| - virtual void CopyStateFromAndPrune(
|
| - NavigationController* source) OVERRIDE;
|
| + virtual void CopyStateFromAndPrune(NavigationController* source,
|
| + bool replace_entry) OVERRIDE;
|
| virtual bool CanPruneAllButLastCommitted() OVERRIDE;
|
| virtual void PruneAllButLastCommitted() OVERRIDE;
|
| virtual void ClearAllScreenshots() OVERRIDE;
|
|
|