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 357 matching lines @@
   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;
   }

[Dan Beam, 2012/04/05 17:58:35]

nit: \n

-
-  // 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::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();
+}
+
 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);
   }
 }
 
 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