chrome/browser/guest_view/extension_options/extension_options_guest.cc - Issue 518653002: Add the "options_ui" extension manifest field.

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/extension_options/extension_options_guest.cc

Issue 518653002: Add the "options_ui" extension manifest field. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix everything 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

« chrome/browser/extensions/extension_tab_util.cc ('K') | « chrome/browser/extensions/extension_tab_util.cc ('k') | chrome/browser/resources/extensions/extension_list.js » ('j') | chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 9fc3c5d4c03f1cd882ed5bd3ef7ed1c9ebc938c6..a03a5b32e7adf46bb778079334a587053a2adcf0 100644

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

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

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

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/tabs/tab_strip_model.h"

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

-#include "chrome/common/extensions/manifest_url_handler.h"

#include "components/crx_file/id_util.h"

#include "components/renderer_context_menu/context_menu_delegate.h"

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

@@ -27,6 +26,7 @@

#include "extensions/common/extension.h"

#include "extensions/common/extension_messages.h"

#include "extensions/common/feature_switch.h"

+#include "extensions/common/manifest_handlers/options_page_info.h"

#include "extensions/common/permissions/permissions_data.h"

#include "extensions/strings/grit/extensions_strings.h"

#include "ipc/ipc_message_macros.h"

@@ -89,7 +89,7 @@ void ExtensionOptionsGuest::CreateWebContents(

extensions::ExtensionRegistry::Get(browser_context());

const extensions::Extension* extension =

registry->enabled_extensions().GetByID(extension_id);

- options_page_ = extensions::ManifestURL::GetOptionsPage(extension);

+ options_page_ = extensions::OptionsPageInfo::GetOptionsPage(extension);

if (!options_page_.is_valid()) {

callback.Run(NULL);

return;