chrome/browser/guest_view/guest_view_base.cc - Issue 378783002: Initial implementation of the <extensionoptions> GuestView tag

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: chrome/browser/guest_view/guest_view_base.cc

Issue 378783002: Initial implementation of the <extensionoptions> GuestView tag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase, update ExtensionOptionsGuest construction Created 6 years, 5 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/guest_view_base.cc

diff --git a/chrome/browser/guest_view/guest_view_base.cc b/chrome/browser/guest_view/guest_view_base.cc

index 402ee2b6db5cf0555d95303a386d44d905685734..43a9378c7a3204664fca558e25536cbf6e3f3fe0 100644

--- a/chrome/browser/guest_view/guest_view_base.cc

+++ b/chrome/browser/guest_view/guest_view_base.cc

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

#include "base/lazy_instance.h"

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/guest_view/app_view/app_view_guest.h"

+#include "chrome/browser/guest_view/extension_options/extension_options_guest.h"

#include "chrome/browser/guest_view/guest_view_constants.h"

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

#include "chrome/browser/guest_view/web_view/web_view_guest.h"

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

#include "content/public/browser/web_contents.h"

#include "content/public/common/url_constants.h"

#include "extensions/browser/event_router.h"

+#include "extensions/common/feature_switch.h"

Fady Samuel 2014/07/22 00:42:52 nit: This line isn't necessary right?

ericzeng 2014/07/22 01:45:26 Done.

#include "third_party/WebKit/public/web/WebInputEvent.h"

using content::WebContents;

@@ -146,6 +148,7 @@ void GuestViewBase::InitWithWebContents(

void GuestViewBase::RegisterGuestViewTypes() {

GuestView<WebViewGuest>::Register();

GuestView<AppViewGuest>::Register();

+ GuestView<ExtensionOptionsGuest>::Register();

}

// static

« no previous file with comments | « chrome/browser/guest_view/extension_options/extension_options_guest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »