[uber page] Split up initialization of handlers from initialization of webui pages

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 293 matching lines @@
 }
 
 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_)
-    return;
+  if (!initialized_handlers_) {
+    for (size_t i = 0; i < handlers_.size(); ++i)
+      handlers_[i]->Initialize();
+  }
+
   initialized_handlers_ = true;

[csilv, 2012/03/13 20:59:49]

Move this line into the 'if' block.

[Dan Beam, 2012/03/13 23:01:45]

Done.

 
   for (size_t i = 0; i < handlers_.size(); ++i)
-    handlers_[i]->Initialize();
+    handlers_[i]->SendPageValues();
 }
 
 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());
@@ skipping 10 matching lines @@
       WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString());
 #else
   command_line_string =
       CommandLine::ForCurrentProcess()->GetCommandLineString();
 #endif
 
   render_view_host->SetWebUIProperty("commandLineString", command_line_string);
 }
 
 }  // namespace options2