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

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

Issue 12313067: Prevent bindings escalation on an existing NavigationEntry (attempt 3). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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_RENDER_VIEW_HOST_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 134
135 // Returns the current committed Web UI or NULL if none applies. 135 // Returns the current committed Web UI or NULL if none applies.
136 WebUIImpl* web_ui() const { return web_ui_.get(); } 136 WebUIImpl* web_ui() const { return web_ui_.get(); }
137 137
138 // Returns the Web UI for the pending navigation, or NULL of none applies. 138 // Returns the Web UI for the pending navigation, or NULL of none applies.
139 WebUIImpl* pending_web_ui() const { 139 WebUIImpl* pending_web_ui() const {
140 return pending_web_ui_.get() ? pending_web_ui_.get() : 140 return pending_web_ui_.get() ? pending_web_ui_.get() :
141 pending_and_current_web_ui_.get(); 141 pending_and_current_web_ui_.get();
142 } 142 }
143 143
144 // Sets the pending Web UI for the pending navigation, ensuring that the
145 // bindings are appropriate for the given NavigationEntry.
146 void SetPendingWebUI(const NavigationEntryImpl& entry);
147
144 // Called when we want to instruct the renderer to navigate to the given 148 // Called when we want to instruct the renderer to navigate to the given
145 // navigation entry. It may create a new RenderViewHost or re-use an existing 149 // navigation entry. It may create a new RenderViewHost or re-use an existing
146 // one. The RenderViewHost to navigate will be returned. Returns NULL if one 150 // one. The RenderViewHost to navigate will be returned. Returns NULL if one
147 // could not be created. 151 // could not be created.
148 RenderViewHostImpl* Navigate(const NavigationEntryImpl& entry); 152 RenderViewHostImpl* Navigate(const NavigationEntryImpl& entry);
149 153
150 // Instructs the various live views to stop. Called when the user directed the 154 // Instructs the various live views to stop. Called when the user directed the
151 // page to stop loading. 155 // page to stop loading.
152 void Stop(); 156 void Stop();
153 157
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 InterstitialPageImpl* interstitial_page_; 327 InterstitialPageImpl* interstitial_page_;
324 328
325 NotificationRegistrar registrar_; 329 NotificationRegistrar registrar_;
326 330
327 DISALLOW_COPY_AND_ASSIGN(RenderViewHostManager); 331 DISALLOW_COPY_AND_ASSIGN(RenderViewHostManager);
328 }; 332 };
329 333
330 } // namespace content 334 } // namespace content
331 335
332 #endif // CONTENT_BROWSER_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_ 336 #endif // CONTENT_BROWSER_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
OLDNEW
« no previous file with comments | « content/browser/web_contents/navigation_entry_impl.cc ('k') | content/browser/web_contents/render_view_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698