Simplify adding callbacks.

chrome/browser/ui/webui/chromeos/login/base_screen_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_BASE_SCREEN_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_BASE_SCREEN_HANDLER_H_
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/callback.h"
 #include "base/string16.h"
+#include "base/values.h"

[bartfab (slow), 2013/04/16 17:04:35]

Where is this needed? The values used in this file are forward-declared in lines
21-23.

[ygorshenin1, 2013/04/16 17:52:43]

Done.

+#include "chrome/browser/ui/webui/chromeos/login/base_screen_handler_utils.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 class Value;
 }
 
@@ skipping 75 matching lines @@
   void CallJS(const std::string& method,
               const base::Value& arg1,
               const base::Value& arg2,
               const base::Value& arg3);
   void CallJS(const std::string& method,
               const base::Value& arg1,
               const base::Value& arg2,
               const base::Value& arg3,
               const base::Value& arg4);
 
-  // Shortcut method for adding WebUI callbacks.
+  // Shortcut methods for adding WebUI callbacks.
   template<typename T>
   void AddCallback(const std::string& name,
-                   void (T::*callback)(const base::ListValue* args)) {
+                   void (T::*method)(const base::ListValue* args)) {
     web_ui()->RegisterMessageCallback(name,
-      base::Bind(callback, base::Unretained(static_cast<T*>(this))));
+      base::Bind(method, base::Unretained(static_cast<T*>(this))));

[bartfab (slow), 2013/04/16 17:04:35]

Argument alignment here and throughout the file:

1/ "name" and "base:Bind(...) should be aligned with each other.
2/ The indentation when breaking an argument list should be four spaces, not
two.

[ygorshenin1, 2013/04/16 17:52:43]

Done.

+  }
+
+  template<typename T>
+  void AddCallback(const std::string& name, void (T::*method)()) {
+    base::Callback<void()> callback =
+      base::Bind(method, base::Unretained(static_cast<T*>(this)));
+    web_ui()->RegisterMessageCallback(name,
+      base::Bind(&CallbackWrapper0, callback));
+  }
+
+  template<typename T, typename A1>
+  void AddCallback(const std::string& name, void (T::*method)(A1 arg1)) {
+    base::Callback<void(A1)> callback =
+      base::Bind(method, base::Unretained(static_cast<T*>(this)));
+    web_ui()->RegisterMessageCallback(name,
+      base::Bind(&CallbackWrapper1<A1>, callback));
+  }
+
+  template<typename T, typename A1, typename A2>
+  void AddCallback(const std::string& name,
+                   void (T::*method)(A1 arg1, A2 arg2)) {
+    base::Callback<void(A1, A2)> callback =
+      base::Bind(method, base::Unretained(static_cast<T*>(this)));
+    web_ui()->RegisterMessageCallback(name,
+      base::Bind(&CallbackWrapper2<A1, A2>, callback));
+  }
+
+  template<typename T, typename A1, typename A2, typename A3>
+  void AddCallback(const std::string& name,
+                   void (T::*method)(A1 arg1, A2 arg2, A3 arg3)) {
+    base::Callback<void(A1, A2, A3)> callback =
+      base::Bind(method, base::Unretained(static_cast<T*>(this)));
+    web_ui()->RegisterMessageCallback(name,
+      base::Bind(&CallbackWrapper3<A1, A2, A3>, callback));
+  }
+
+  template<typename T, typename A1, typename A2, typename A3, typename A4>
+  void AddCallback(const std::string& name,
+                   void (T::*method)(A1 arg1, A2 arg2, A3 arg3, A4 arg4)) {
+    base::Callback<void(A1, A2, A3, A4)> callback =
+      base::Bind(method, base::Unretained(static_cast<T*>(this)));
+    web_ui()->RegisterMessageCallback(name,
+      base::Bind(&CallbackWrapper4<A1, A2, A3, A4>, callback));
   }
 
   // Called when the page is ready and handler can do initialization.
   virtual void Initialize() = 0;
 
   // Show selected WebUI |screen|. Optionally it can pass screen initialization
   // data via |data| parameter.
   void ShowScreen(const char* screen, const base::DictionaryValue* data);
 
   // Whether page is ready.
   bool page_is_ready() const { return page_is_ready_; }
 
   // Returns the window which shows us.
   virtual gfx::NativeWindow GetNativeWindow();
 
  private:
   // Keeps whether page is ready.
   bool page_is_ready_;
 
   base::DictionaryValue* localized_values_;
 
   DISALLOW_COPY_AND_ASSIGN(BaseScreenHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_BASE_SCREEN_HANDLER_H_