Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(193)

Side by Side Diff: content/browser/frame_host/navigation_controller_impl.h

Issue 1010243002: PlzNavigate: Properly set the pending entry in the NavigatorImpl unit test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 // Sets the screenshot manager for this NavigationControllerImpl. The 195 // Sets the screenshot manager for this NavigationControllerImpl. The
196 // controller takes ownership of the screenshot manager and destroys it when 196 // controller takes ownership of the screenshot manager and destroys it when
197 // a new screenshot-manager is set, or when the controller is destroyed. 197 // a new screenshot-manager is set, or when the controller is destroyed.
198 // Setting a NULL manager recreates the default screenshot manager and uses 198 // Setting a NULL manager recreates the default screenshot manager and uses
199 // that. 199 // that.
200 void SetScreenshotManager(NavigationEntryScreenshotManager* manager); 200 void SetScreenshotManager(NavigationEntryScreenshotManager* manager);
201 201
202 // Discards only the pending entry. 202 // Discards only the pending entry.
203 void DiscardPendingEntry(); 203 void DiscardPendingEntry();
204 204
205 // Sets the entry and index of the pending entry. Only for testing.
206 void SetPendingEntryAndIndexForTesting(int index);
207
205 private: 208 private:
206 friend class RestoreHelper; 209 friend class RestoreHelper;
207 210
208 FRIEND_TEST_ALL_PREFIXES(NavigationControllerTest, 211 FRIEND_TEST_ALL_PREFIXES(NavigationControllerTest,
209 PurgeScreenshot); 212 PurgeScreenshot);
210 FRIEND_TEST_ALL_PREFIXES(TimeSmoother, Basic); 213 FRIEND_TEST_ALL_PREFIXES(TimeSmoother, Basic);
211 FRIEND_TEST_ALL_PREFIXES(TimeSmoother, SingleDuplicate); 214 FRIEND_TEST_ALL_PREFIXES(TimeSmoother, SingleDuplicate);
212 FRIEND_TEST_ALL_PREFIXES(TimeSmoother, ManyDuplicates); 215 FRIEND_TEST_ALL_PREFIXES(TimeSmoother, ManyDuplicates);
213 FRIEND_TEST_ALL_PREFIXES(TimeSmoother, ClockBackwardsJump); 216 FRIEND_TEST_ALL_PREFIXES(TimeSmoother, ClockBackwardsJump);
214 217
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 TimeSmoother time_smoother_; 411 TimeSmoother time_smoother_;
409 412
410 scoped_ptr<NavigationEntryScreenshotManager> screenshot_manager_; 413 scoped_ptr<NavigationEntryScreenshotManager> screenshot_manager_;
411 414
412 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl); 415 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl);
413 }; 416 };
414 417
415 } // namespace content 418 } // namespace content
416 419
417 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_ 420 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698