Implemented argument wrapping for CallJS.

chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc

 // Copyright (c) 2013 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/chromeos/login/terms_of_service_screen_handler.h"
 
 #include "base/values.h"

[bartfab (slow), 2013/04/18 07:39:31]

Nit: No longer used.

[ygorshenin1, 2013/04/18 07:58:23]

Done.

 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
 namespace chromeos {
 
 TermsOfServiceScreenHandler::TermsOfServiceScreenHandler()
     : screen_(NULL),
       show_on_init_(false),
       load_error_(false) {
@@ skipping 69 matching lines @@
 }
 
 void TermsOfServiceScreenHandler::Initialize() {
   if (show_on_init_) {
     Show();
     show_on_init_ = false;
   }
 }
 
 void TermsOfServiceScreenHandler::UpdateDomainInUI() {
-  if (!page_is_ready())
-    return;
-
-  base::StringValue domain(domain_);
-  CallJS("cr.ui.Oobe.setTermsOfServiceDomain", domain);
+  if (page_is_ready())
+    CallJS("cr.ui.Oobe.setTermsOfServiceDomain", domain_);
 }
 
 void TermsOfServiceScreenHandler::UpdateTermsOfServiceInUI() {
   if (!page_is_ready())
     return;
 
   // If either |load_error_| or |terms_of_service_| is set, the download of the
   // Terms of Service has completed and the UI should be updated. Otherwise, the
   // download is still in progress and the UI will be updated when the
   // OnLoadError() or the OnLoadSuccess() callback is called.
-  if (load_error_) {
-    web_ui()->CallJavascriptFunction("cr.ui.Oobe.setTermsOfServiceLoadError");
-  } else if (!terms_of_service_.empty()) {
-    base::StringValue terms_of_service(terms_of_service_);
-    web_ui()->CallJavascriptFunction("cr.ui.Oobe.setTermsOfService",
-                                     terms_of_service);
-  }
+  if (load_error_)
+    CallJS("cr.ui.Oobe.setTermsOfServiceLoadError");
+  else if (!terms_of_service_.empty())
+    CallJS("cr.ui.Oobe.setTermsOfService", terms_of_service_);
 }
 
 void TermsOfServiceScreenHandler::HandleBack() {
   if (screen_)
     screen_->OnDecline();
 }
 
 void TermsOfServiceScreenHandler::HandleAccept() {
   if (!screen_)
     return;
 
   // If the Terms of Service have not been successfully downloaded, the "accept
   // and continue" button should not be accessible. If the user managed to
   // activate it somehow anway, do not treat this as acceptance of the Terms
   // and Conditions and end the session instead, as if the user had declined.
   if (terms_of_service_.empty())
     screen_->OnDecline();
   else
     screen_->OnAccept();
 }
 
 }  // namespace chromeos