| Index: chrome/browser/ui/webui/options2/options_ui2.h
|
| diff --git a/chrome/browser/ui/webui/options2/options_ui2.h b/chrome/browser/ui/webui/options2/options_ui2.h
|
| index 09faebefe7328a1d145a7121234aad53f9e775d0..4ca6a6ab594f76edf3b2824fe81c252aed972a15 100644
|
| --- a/chrome/browser/ui/webui/options2/options_ui2.h
|
| +++ b/chrome/browser/ui/webui/options2/options_ui2.h
|
| @@ -91,7 +91,7 @@ class OptionsPageUIHandler : public content::WebUIMessageHandler,
|
| // should provide.
|
| class OptionsPageUIHandlerHost {
|
| public:
|
| - virtual void InitializeHandlers() = 0;
|
| + virtual void InitializePages() = 0;
|
|
|
| protected:
|
| virtual ~OptionsPageUIHandlerHost() {}
|
| @@ -117,10 +117,9 @@ class OptionsUI : public content::WebUIController,
|
| content::RenderViewHost* render_view_host) OVERRIDE;
|
| virtual void RenderViewReused(
|
| content::RenderViewHost* render_view_host) OVERRIDE;
|
| - virtual void DidBecomeActiveForReusedRenderView() OVERRIDE;
|
|
|
| // Overridden from OptionsPageUIHandlerHost:
|
| - virtual void InitializeHandlers() OVERRIDE;
|
| + virtual void InitializePages() OVERRIDE;
|
|
|
| private:
|
| // Adds OptionsPageUiHandler to the handlers list if handler is enabled.
|
| @@ -131,8 +130,6 @@ class OptionsUI : public content::WebUIController,
|
| // launching chrome.
|
| void SetCommandLineString(content::RenderViewHost* render_view_host);
|
|
|
| - bool initialized_handlers_;
|
| -
|
| std::vector<OptionsPageUIHandler*> handlers_;
|
|
|
| #if defined(OS_CHROMEOS)
|
|
|