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

Unified Diff: chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc

Issue 496873006: Move core web_view code to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small changes are made, Created 6 years, 4 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
Index: chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc
diff --git a/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc b/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc
index 8175022edca475e6ede42075a725f5070540ffb0..3168a52cb0261fdb3e1c8ba044a48da6e3cb55c8 100644
--- a/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc
+++ b/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc
@@ -7,13 +7,13 @@
#include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
#include "chrome/browser/favicon/favicon_tab_helper.h"
-#include "chrome/browser/guest_view/web_view/web_view_constants.h"
#include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
#include "chrome/browser/ui/pdf/pdf_tab_helper.h"
#include "chrome/browser/ui/zoom/zoom_controller.h"
#include "chrome/common/chrome_version_info.h"
#include "components/renderer_context_menu/context_menu_delegate.h"
#include "content/public/common/page_zoom.h"
+#include "extensions/browser/guest_view/web_view/web_view_constants.h"
#if defined(ENABLE_PRINTING)
#if defined(ENABLE_FULL_PRINTING)
@@ -26,11 +26,10 @@
ChromeWebViewGuestDelegate::ChromeWebViewGuestDelegate(
extensions::WebViewGuest* web_view_guest)
- : WebViewGuestDelegate(),
+ : WebViewGuestDelegate(web_view_guest),
pending_context_menu_request_id_(0),
chromevox_injected_(false),
- current_zoom_factor_(1.0),
- web_view_guest_(web_view_guest) {
+ current_zoom_factor_(1.0) {
}
ChromeWebViewGuestDelegate::~ChromeWebViewGuestDelegate() {
@@ -55,7 +54,7 @@ bool ChromeWebViewGuestDelegate::HandleContextMenu(
MenuModelToValue(pending_menu_->menu_model());
args->Set(webview::kContextMenuItems, items.release());
args->SetInteger(webview::kRequestId, request_id);
- web_view_guest_->DispatchEventToEmbedder(
+ web_view_guest()->DispatchEventToEmbedder(
new extensions::GuestViewBase::Event(
webview::kEventContextMenu, args.Pass()));
return true;
@@ -118,10 +117,10 @@ void ChromeWebViewGuestDelegate::OnDocumentLoadedInFrame(
void ChromeWebViewGuestDelegate::OnGuestDestroyed() {
// Clean up custom context menu items for this guest.
extensions::MenuManager* menu_manager = extensions::MenuManager::Get(
- Profile::FromBrowserContext(web_view_guest_->browser_context()));
+ Profile::FromBrowserContext(web_view_guest()->browser_context()));
menu_manager->RemoveAllContextItems(extensions::MenuItem::ExtensionKey(
- web_view_guest_->embedder_extension_id(),
- web_view_guest_->view_instance_id()));
+ web_view_guest()->embedder_extension_id(),
+ web_view_guest()->view_instance_id()));
}
// static
@@ -150,7 +149,7 @@ void ChromeWebViewGuestDelegate::OnSetZoom(double zoom_factor) {
scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
args->SetDouble(webview::kOldZoomFactor, current_zoom_factor_);
args->SetDouble(webview::kNewZoomFactor, zoom_factor);
- web_view_guest_->DispatchEventToEmbedder(
+ web_view_guest()->DispatchEventToEmbedder(
new extensions::GuestViewBase::Event(
webview::kEventZoomChange, args.Pass()));
current_zoom_factor_ = zoom_factor;

Powered by Google App Engine
This is Rietveld 408576698