extensions/browser/guest_view/extension_options/extension_options_guest.cc - Issue 1087123002: Towards Decoupling GuestView from Extensions

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/browser/guest_view/extension_options/extension_options_guest.cc

Issue 1087123002: Towards Decoupling GuestView from Extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed lazyboy@'s comments. Removed unnecessary includes. Simplified GuestViewEvent. Created 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc ('k') | extensions/browser/guest_view/extension_view/extension_view_guest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/guest_view/extension_options/extension_options_guest.cc

diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.cc b/extensions/browser/guest_view/extension_options/extension_options_guest.cc

index 7329d919712704be131c061b8981f8187e2b0785..9a60a515e3176891f31342cff2221624212c0e70 100644

--- a/extensions/browser/guest_view/extension_options/extension_options_guest.cc

+++ b/extensions/browser/guest_view/extension_options/extension_options_guest.cc

@@ -18,6 +18,7 @@

#include "extensions/browser/extension_web_contents_observer.h"

#include "extensions/browser/guest_view/extension_options/extension_options_constants.h"

#include "extensions/browser/guest_view/extension_options/extension_options_guest_delegate.h"

+#include "extensions/browser/guest_view/guest_view_event.h"

#include "extensions/browser/guest_view/guest_view_manager.h"

#include "extensions/common/api/extension_options_internal.h"

#include "extensions/common/constants.h"

@@ -127,7 +128,7 @@ void ExtensionOptionsGuest::DidInitialize(

void ExtensionOptionsGuest::GuestViewDidStopLoading() {

scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());

- DispatchEventToView(new GuestViewBase::Event(

+ DispatchEventToView(new GuestViewEvent(

extension_options_internal::OnLoad::kEventName, args.Pass()));

}

@@ -152,7 +153,7 @@ void ExtensionOptionsGuest::OnPreferredSizeChanged(const gfx::Size& pref_size) {

// Convert the size from physical pixels to logical pixels.

options.width = PhysicalPixelsToLogicalPixels(pref_size.width());

options.height = PhysicalPixelsToLogicalPixels(pref_size.height());

- DispatchEventToView(new GuestViewBase::Event(

+ DispatchEventToView(new GuestViewEvent(

extension_options_internal::OnPreferredSizeChanged::kEventName,

options.ToValue()));

}

@@ -185,8 +186,8 @@ content::WebContents* ExtensionOptionsGuest::OpenURLFromTab(

void ExtensionOptionsGuest::CloseContents(content::WebContents* source) {

DispatchEventToView(

- new GuestViewBase::Event(extension_options_internal::OnClose::kEventName,

- make_scoped_ptr(new base::DictionaryValue())));

+ new GuestViewEvent(extension_options_internal::OnClose::kEventName,

+ make_scoped_ptr(new base::DictionaryValue())));

}

bool ExtensionOptionsGuest::HandleContextMenu(