chrome/browser/ui/webui/options/options_ui.cc - Issue 380893005: Add an option page for searching and managing resources and permissions.

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/ui/webui/options/options_ui.cc

Issue 380893005: Add an option page for searching and managing resources and permissions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressing comments. 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

« chrome/browser/resources/options/website_settings.js ('K') | « chrome/browser/ui/webui/options/browser_options_handler.cc ('k') | chrome/browser/ui/webui/options/website_settings_browsertest.js » ('j') | chrome/browser/ui/webui/options/website_settings_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/options_ui.cc

diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc

index 5d57734eefd494cdaefb492d3df357004d82f98c..8c63909ef1edb2725f513364f842439cae08642c 100644

--- a/chrome/browser/ui/webui/options/options_ui.cc

+++ b/chrome/browser/ui/webui/options/options_ui.cc

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

#include "chrome/browser/ui/webui/options/reset_profile_settings_handler.h"

#include "chrome/browser/ui/webui/options/search_engine_manager_handler.h"

#include "chrome/browser/ui/webui/options/startup_pages_handler.h"

+#include "chrome/browser/ui/webui/options/website_settings_handler.h"

#include "chrome/browser/ui/webui/sync_setup_handler.h"

#include "chrome/browser/ui/webui/theme_source.h"

#include "chrome/common/url_constants.h"

@@ -295,6 +296,7 @@ OptionsUI::OptionsUI(content::WebUI* web_ui)

AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler());

AddOptionsPageUIHandler(localized_strings, new SyncSetupHandler(

g_browser_process->profile_manager()));

+ AddOptionsPageUIHandler(localized_strings, new WebsiteSettingsHandler());

#if defined(OS_CHROMEOS)

AddOptionsPageUIHandler(localized_strings,

new chromeos::options::AccountsOptionsHandler());