Separate handler initialization from page initialization

chrome/browser/ui/webui/options2/options_ui2.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options2/options_ui2.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 191 matching lines @@
           l10n_util::GetStringUTF16(title_id)));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // OptionsUI
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 OptionsUI::OptionsUI(content::WebUI* web_ui)
-    : WebUIController(web_ui),
-      initialized_handlers_(false) {
+    : WebUIController(web_ui) {
   DictionaryValue* localized_strings = new DictionaryValue();
 
   CoreOptionsHandler* core_handler;
 #if defined(OS_CHROMEOS)
   core_handler = new chromeos::options2::CoreChromeOSOptionsHandler();
 #else
   core_handler = new CoreOptionsHandler();
 #endif
   core_handler->set_handlers_host(this);
   AddOptionsPageUIHandler(localized_strings, core_handler);
@@ skipping 67 matching lines @@
   AddOptionsPageUIHandler(localized_strings, new CertificateManagerHandler());
 #endif
   AddOptionsPageUIHandler(localized_strings, new HandlerOptionsHandler());
 
   // |localized_strings| ownership is taken over by this constructor.
   OptionsUIHTMLSource* html_source =
       new OptionsUIHTMLSource(localized_strings);
 
   // Set up the chrome://settings-frame/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
+  DCHECK(!profile->IsOffTheRecord() || Profile::IsGuestSession());
   profile->GetChromeURLDataManager()->AddDataSource(html_source);
 
   // Set up the chrome://theme/ source.
   ThemeSource* theme = new ThemeSource(profile);
   profile->GetChromeURLDataManager()->AddDataSource(theme);
 
 #if defined(OS_CHROMEOS)
   // Set up the chrome://userimage/ source.
   chromeos::options2::UserImageSource* user_image_source =
       new chromeos::options2::UserImageSource();
   profile->GetChromeURLDataManager()->AddDataSource(user_image_source);
 
   pointer_device_observer_.reset(
       new chromeos::system::PointerDeviceObserver());
   pointer_device_observer_->AddObserver(browser_options_handler);
   pointer_device_observer_->AddObserver(pointer_handler);
+  pointer_device_observer_->Init();
 #endif
 }
 
 OptionsUI::~OptionsUI() {
   // Uninitialize all registered handlers. Deleted by WebUIImpl.
   for (size_t i = 0; i < handlers_.size(); ++i)
     handlers_[i]->Uninitialize();
 }
 
 void OptionsUI::RenderViewCreated(RenderViewHost* render_view_host) {
   SetCommandLineString(render_view_host);
 }
 
 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,
       ListValue * const suggestions) {
   for (size_t i = 0; i < autocompleteResult.size(); ++i) {
     const AutocompleteMatch& match = autocompleteResult.match_at(i);
     AutocompleteMatch::Type type = match.type;
     if (type != AutocompleteMatch::HISTORY_URL &&
         type != AutocompleteMatch::HISTORY_TITLE &&
         type != AutocompleteMatch::HISTORY_BODY &&
         type != AutocompleteMatch::HISTORY_KEYWORD &&
         type != AutocompleteMatch::NAVSUGGEST)
       continue;
     DictionaryValue* entry = new DictionaryValue();
     entry->SetString("title", match.description);
     entry->SetString("displayURL", match.contents);
     entry->SetString("url", match.destination_url.spec());
     suggestions->Append(entry);
   }
 }
 
 // static
 RefCountedMemory* OptionsUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_SETTINGS_FAVICON);
 }
 
-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.
-  if (!initialized_handlers_) {
-    for (size_t i = 0; i < handlers_.size(); ++i)
-      handlers_[i]->InitializeHandler();
-    initialized_handlers_ = true;
-  }
-
+void OptionsUI::InitializePages() {
   // Always initialize the page as when handlers are left over we still need to
   // do various things like show/hide sections and send data to the Javascript.
   for (size_t i = 0; i < handlers_.size(); ++i)
     handlers_[i]->InitializePage();
+}
 
-#if defined(OS_CHROMEOS)
-  pointer_device_observer_->Init();
-#endif
+void OptionsUI::InitializeHandlers() {
+  for (size_t i = 0; i < handlers_.size(); i++)
+    handlers_[i]->InitializeHandler();
 }
 
 void OptionsUI::AddOptionsPageUIHandler(DictionaryValue* localized_strings,
                                         OptionsPageUIHandler* handler_raw) {
   scoped_ptr<OptionsPageUIHandler> handler(handler_raw);
   DCHECK(handler.get());
   // Add only if handler's service is enabled.
   if (handler->IsEnabled()) {
-    // Add handler to the list and also pass the ownership.
-    web_ui()->AddMessageHandler(handler.release());
-    handler_raw->GetLocalizedValues(localized_strings);
-    handlers_.push_back(handler_raw);
+    // Add handler to the list
+    web_ui()->AddMessageHandler(handler.get());
+    handler->GetLocalizedValues(localized_strings);
+    handlers_.push_back(handler.release());
   }
 }
 
 void OptionsUI::SetCommandLineString(RenderViewHost* render_view_host) {
   std::string command_line_string;
 
 #if defined(OS_WIN)
   command_line_string =
       WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString());
 #else
   command_line_string =
       CommandLine::ForCurrentProcess()->GetCommandLineString();
 #endif
 
   render_view_host->SetWebUIProperty("commandLineString", command_line_string);
 }
 
 }  // namespace options2