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

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

Issue 14283005: Allow showing pending URL for new tab navigations, but only if safe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 6 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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 int32 page_id) const; 114 int32 page_id) const;
115 115
116 // WebContentsImpl ----------------------------------------------------------- 116 // WebContentsImpl -----------------------------------------------------------
117 117
118 WebContentsImpl* web_contents() const { 118 WebContentsImpl* web_contents() const {
119 return web_contents_; 119 return web_contents_;
120 } 120 }
121 121
122 // For use by WebContentsImpl ------------------------------------------------ 122 // For use by WebContentsImpl ------------------------------------------------
123 123
124 // Allow renderer-initiated navigations to create a pending entry when the
125 // provisional load starts.
126 void SetPendingEntry(content::NavigationEntryImpl* entry);
127
124 // Handles updating the navigation state after the renderer has navigated. 128 // Handles updating the navigation state after the renderer has navigated.
125 // This is used by the WebContentsImpl. 129 // This is used by the WebContentsImpl.
126 // 130 //
127 // If a new entry is created, it will return true and will have filled the 131 // If a new entry is created, it will return true and will have filled the
128 // given details structure and broadcast the NOTIFY_NAV_ENTRY_COMMITTED 132 // given details structure and broadcast the NOTIFY_NAV_ENTRY_COMMITTED
129 // notification. The caller can then use the details without worrying about 133 // notification. The caller can then use the details without worrying about
130 // listening for the notification. 134 // listening for the notification.
131 // 135 //
132 // In the case that nothing has changed, the details structure is undefined 136 // In the case that nothing has changed, the details structure is undefined
133 // and it will return false. 137 // and it will return false.
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 TimeSmoother time_smoother_; 399 TimeSmoother time_smoother_;
396 400
397 scoped_ptr<WebContentsScreenshotManager> screenshot_manager_; 401 scoped_ptr<WebContentsScreenshotManager> screenshot_manager_;
398 402
399 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl); 403 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl);
400 }; 404 };
401 405
402 } // namespace content 406 } // namespace content
403 407
404 #endif // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_ 408 #endif // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698