chrome/browser/dom_ui/options_ui.cc - Issue 2804039: First cut at the tabbed content settings page.

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/dom_ui/options_ui.cc

Issue 2804039: First cut at the tabbed content settings page. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: no change Created 10 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:

Index: chrome/browser/dom_ui/options_ui.cc

diff --git a/chrome/browser/dom_ui/options_ui.cc b/chrome/browser/dom_ui/options_ui.cc

index 4b77ea5539d8ca9e621f3352bf7dea0e0b60bdf2..97e8aba24ab3dff0350444624a517b84fc962606 100644

--- a/chrome/browser/dom_ui/options_ui.cc

+++ b/chrome/browser/dom_ui/options_ui.cc

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

#include "chrome/browser/chrome_thread.h"

#include "chrome/browser/dom_ui/advanced_options_handler.h"

#include "chrome/browser/dom_ui/browser_options_handler.h"

+#include "chrome/browser/dom_ui/content_settings_handler.h"

#include "chrome/browser/dom_ui/core_options_handler.h"

#include "chrome/browser/dom_ui/personal_options_handler.h"

#include "chrome/browser/metrics/user_metrics.h"

@@ -112,6 +113,7 @@ OptionsUI::OptionsUI(TabContents* contents) : DOMUI(contents) {

AddOptionsPageUIHandler(localized_strings, new SyncOptionsHandler());

AddOptionsPageUIHandler(localized_strings, new LabsHandler());

#endif

+ AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler());

// |localized_strings| ownership is taken over by this constructor.

OptionsUIHTMLSource* html_source =

« no previous file with comments | « chrome/browser/dom_ui/dom_ui.h ('k') | chrome/browser/resources/options.html » ('j') | no next file with comments »