chrome/browser/ui/webui/options2/browser_options_handler2.h - Issue 9693032: [uber page] Split up initialization of handlers from initialization of webui pages

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/options2/browser_options_handler2.h

Issue 9693032: [uber page] Split up initialization of handlers from initialization of webui pages (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: code shuffling Created 8 years, 9 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/ui/webui/options2/autofill_options_handler2.cc ('k') | chrome/browser/ui/webui/options2/browser_options_handler2.cc » ('j') | chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options2/browser_options_handler2.h

diff --git a/chrome/browser/ui/webui/options2/browser_options_handler2.h b/chrome/browser/ui/webui/options2/browser_options_handler2.h

index 43e70549fce48d9e1f907eb4ad1edfbc925cfe54..ea598adff90cbdc23efc32f572a64e6dc0f25b0d 100644

--- a/chrome/browser/ui/webui/options2/browser_options_handler2.h

+++ b/chrome/browser/ui/webui/options2/browser_options_handler2.h

@@ -41,11 +41,12 @@ class BrowserOptionsHandler

BrowserOptionsHandler();

virtual ~BrowserOptionsHandler();

- virtual void Initialize() OVERRIDE;

+ virtual void InitializeHandler() OVERRIDE;

// OptionsPageUIHandler implementation.

virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;

virtual void RegisterMessages() OVERRIDE;

+ virtual void InitializePage() OVERRIDE;

// ProfileSyncServiceObserver implementation.

virtual void OnStateChanged() OVERRIDE;

@@ -112,7 +113,7 @@ class BrowserOptionsHandler

void SetDefaultBrowserUIString(int status_string_id);

// Loads the possible default search engine list and reports it to the WebUI.

- void UpdateSearchEngines();

+ void AddTemplateUrlServiceObserver();

// Sends an array of Profile objects to javascript.

// Each object is of the form: