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

Unified Diff: extensions/browser/guest_view/app_view/app_view_guest.cc

Issue 525793002: Make WebContentsObserver::web_contents() public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments addressed Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/browser/web_contents_observer.h ('k') | extensions/browser/guest_view/guest_view_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/guest_view/app_view/app_view_guest.cc
diff --git a/extensions/browser/guest_view/app_view/app_view_guest.cc b/extensions/browser/guest_view/app_view/app_view_guest.cc
index 7232583d37c2d8b165ea607ff3f671efe972177e..d3a40ecd9c82571921d800778b3578556bdbf748 100644
--- a/extensions/browser/guest_view/app_view/app_view_guest.cc
+++ b/extensions/browser/guest_view/app_view/app_view_guest.cc
@@ -113,7 +113,7 @@ WindowController* AppViewGuest::GetExtensionWindowController() const {
}
content::WebContents* AppViewGuest::GetAssociatedWebContents() const {
- return guest_web_contents();
+ return web_contents();
}
bool AppViewGuest::OnMessageReceived(const IPC::Message& message) {
@@ -127,8 +127,7 @@ bool AppViewGuest::OnMessageReceived(const IPC::Message& message) {
bool AppViewGuest::HandleContextMenu(const content::ContextMenuParams& params) {
if (app_view_guest_delegate_) {
- return app_view_guest_delegate_->HandleContextMenu(guest_web_contents(),
- params);
+ return app_view_guest_delegate_->HandleContextMenu(web_contents(), params);
}
return false;
}
@@ -203,7 +202,7 @@ void AppViewGuest::DidAttachToEmbedder() {
// element. This means that the host element knows how to route input
// events to the guest, and the guest knows how to get frames to the
// embedder.
- guest_web_contents()->GetController().LoadURL(
+ web_contents()->GetController().LoadURL(
url_, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string());
}
@@ -213,8 +212,8 @@ void AppViewGuest::DidInitialize() {
}
void AppViewGuest::OnRequest(const ExtensionHostMsg_Request_Params& params) {
- extension_function_dispatcher_->Dispatch(
- params, guest_web_contents()->GetRenderViewHost());
+ extension_function_dispatcher_->Dispatch(params,
+ web_contents()->GetRenderViewHost());
}
void AppViewGuest::CompleteCreateWebContents(
« no previous file with comments | « content/public/browser/web_contents_observer.h ('k') | extensions/browser/guest_view/guest_view_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698