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

Side by Side Diff: trunk/src/content/browser/web_contents/navigation_controller_impl.h

Issue 13966012: Revert 195553 "Allow showing pending URL for new tab navigations..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 int32 page_id) const; 113 int32 page_id) const;
114 114
115 // WebContentsImpl ----------------------------------------------------------- 115 // WebContentsImpl -----------------------------------------------------------
116 116
117 WebContentsImpl* web_contents() const { 117 WebContentsImpl* web_contents() const {
118 return web_contents_; 118 return web_contents_;
119 } 119 }
120 120
121 // For use by WebContentsImpl ------------------------------------------------ 121 // For use by WebContentsImpl ------------------------------------------------
122 122
123 // Allow renderer-initiated navigations to create a pending entry when the
124 // provisional load starts.
125 void SetPendingEntry(content::NavigationEntryImpl* entry);
126
127 // Handles updating the navigation state after the renderer has navigated. 123 // Handles updating the navigation state after the renderer has navigated.
128 // This is used by the WebContentsImpl. 124 // This is used by the WebContentsImpl.
129 // 125 //
130 // If a new entry is created, it will return true and will have filled the 126 // If a new entry is created, it will return true and will have filled the
131 // given details structure and broadcast the NOTIFY_NAV_ENTRY_COMMITTED 127 // given details structure and broadcast the NOTIFY_NAV_ENTRY_COMMITTED
132 // notification. The caller can then use the details without worrying about 128 // notification. The caller can then use the details without worrying about
133 // listening for the notification. 129 // listening for the notification.
134 // 130 //
135 // In the case that nothing has changed, the details structure is undefined 131 // In the case that nothing has changed, the details structure is undefined
136 // and it will return false. 132 // and it will return false.
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 // the timer resolution, leading to things sometimes showing up in 422 // the timer resolution, leading to things sometimes showing up in
427 // the wrong order in the history view. 423 // the wrong order in the history view.
428 TimeSmoother time_smoother_; 424 TimeSmoother time_smoother_;
429 425
430 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl); 426 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl);
431 }; 427 };
432 428
433 } // namespace content 429 } // namespace content
434 430
435 #endif // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_ 431 #endif // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698