| Index: chrome/browser/ui/webui/options2/options_ui2.cc
|
| diff --git a/chrome/browser/ui/webui/options2/options_ui2.cc b/chrome/browser/ui/webui/options2/options_ui2.cc
|
| index a0adc59a37286169a8ac600891949ef6c22dfe37..9988edbcbe542e5779ce5e76b4e80c894056b908 100644
|
| --- a/chrome/browser/ui/webui/options2/options_ui2.cc
|
| +++ b/chrome/browser/ui/webui/options2/options_ui2.cc
|
| @@ -331,16 +331,6 @@ void OptionsUI::RenderViewReused(RenderViewHost* render_view_host) {
|
| SetCommandLineString(render_view_host);
|
| }
|
|
|
| -void OptionsUI::DidBecomeActiveForReusedRenderView() {
|
| - // When the renderer is re-used (e.g., for back/forward navigation within
|
| - // options), the handlers are torn down and rebuilt, so are no longer
|
| - // initialized, but the web page's DOM may remain intact, in which case onload
|
| - // won't fire to initilize the handlers. To make sure initialization always
|
| - // happens, call reinitializeCore (which is a no-op unless the DOM was already
|
| - // initialized).
|
| - web_ui()->CallJavascriptFunction("OptionsPage.reinitializeCore");
|
| -}
|
| -
|
| // static
|
| void OptionsUI::ProcessAutocompleteSuggestions(
|
| const AutocompleteResult& autocompleteResult,
|
| @@ -372,10 +362,8 @@ void OptionsUI::InitializeHandlers() {
|
| Profile* profile = Profile::FromWebUI(web_ui());
|
| DCHECK(!profile->IsOffTheRecord() || Profile::IsGuestSession());
|
|
|
| - // The reinitialize call from DidBecomeActiveForReusedRenderView end up being
|
| - // delivered after a new web page DOM has been brought up in an existing
|
| - // renderer (due to IPC delays), causing this method to be called twice. If
|
| - // that happens, ignore the second call.
|
| + // A new web page DOM has been brought up in an existing renderer, causing
|
| + // this method to be called twice. If that happens, ignore the second call.
|
| if (!initialized_handlers_) {
|
| for (size_t i = 0; i < handlers_.size(); ++i)
|
| handlers_[i]->InitializeHandler();
|
|
|