MD History: Update sign in state in data source

chrome/browser/ui/webui/history_login_handler.cc

 // Copyright 2015 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/history_login_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/callback_forward.h"

[Dan Beam, 2016/09/30 00:47:43]

base/callback.h

[lshang, 2016/09/30 01:31:08]

Done.

 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/webui/profile_info_watcher.h"
 #include "components/signin/core/browser/signin_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 
-HistoryLoginHandler::HistoryLoginHandler() {}
+HistoryLoginHandler::HistoryLoginHandler(
+    const base::Callback<void(bool)>& signin_callback)
+    : signin_callback_(signin_callback) {}
+
 HistoryLoginHandler::~HistoryLoginHandler() {}
 
 void HistoryLoginHandler::RegisterMessages() {
   profile_info_watcher_.reset(new ProfileInfoWatcher(
       Profile::FromWebUI(web_ui()),
       base::Bind(&HistoryLoginHandler::ProfileInfoChanged,
                  base::Unretained(this))));
 
   web_ui()->RegisterMessageCallback("otherDevicesInitialized",
       base::Bind(&HistoryLoginHandler::HandleOtherDevicesInitialized,
                  base::Unretained(this)));
 
   web_ui()->RegisterMessageCallback("startSignInFlow",
       base::Bind(&HistoryLoginHandler::HandleStartSignInFlow,
                  base::Unretained(this)));
 }
 
 void HistoryLoginHandler::HandleOtherDevicesInitialized(
     const base::ListValue* /*args*/) {
+  AllowJavascript();
   ProfileInfoChanged();
 }
 
 void HistoryLoginHandler::ProfileInfoChanged() {
   bool signed_in = !profile_info_watcher_->GetAuthenticatedUsername().empty();
-  web_ui()->CallJavascriptFunctionUnsafe("updateSignInState",
-                                         base::FundamentalValue(signed_in));
+  if (!signin_callback_.is_null())
+    signin_callback_.Run(signed_in);
+
+  if (IsJavascriptAllowed()) {
+    CallJavascriptFunction("cr.webUIListenerCallback",
+                           base::StringValue("sign-in-state-updated"),
+                           base::FundamentalValue(signed_in));
+  }
 }
 
 void HistoryLoginHandler::HandleStartSignInFlow(
     const base::ListValue* /*args*/) {
   Browser* browser =
       chrome::FindBrowserWithWebContents(web_ui()->GetWebContents());
   browser->window()->ShowAvatarBubbleFromAvatarButton(
       BrowserWindow::AVATAR_BUBBLE_MODE_SIGNIN,
       signin::ManageAccountsParams(),
       signin_metrics::AccessPoint::ACCESS_POINT_RECENT_TABS);
 }