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/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/md_history_ui.cc"

[Dan Beam, 2016/09/22 18:18:52]

whoa whoa whoa, don't include a .cc

[Dan Beam, 2016/09/22 18:19:26]

i accidentally did this the other day, btw, and it wont link on many builders
(duplicate symbols)

[lshang, 2016/09/23 02:00:01]

Definitely a typo! (o_O)!

 #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"
+#include "content/public/browser/web_ui_data_source.h"
 
 HistoryLoginHandler::HistoryLoginHandler() {}
 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*/) {
   ProfileInfoChanged();
 }
 
 void HistoryLoginHandler::ProfileInfoChanged() {
   bool signed_in = !profile_info_watcher_->GetAuthenticatedUsername().empty();
+
+  // Update sign in state in data source so that LoadTimeData() returns updated
+  // value on page reload.
+  Profile* profile = Profile::FromWebUI(web_ui());
+  content::WebUIDataSource* data_source = CreateMdHistoryUIHTMLSource(profile);

[Dan Beam, 2016/09/22 18:18:53]

CreateMdHistoryUIHTMLSource is private to the .cc

[lshang, 2016/09/23 02:00:01]

Done. Removed changes in this file.

+  content::WebUIDataSource::Add(profile, data_source);
+  data_source->AddBoolean("isUserSignedIn", signed_in);
+
   web_ui()->CallJavascriptFunctionUnsafe("updateSignInState",

[calamity, 2016/09/22 08:16:28]

Can we just update what we need to with this updateSignInState call? I think
reloading the whole WebUIDataSource here is really weird.

[Dan Beam, 2016/09/22 18:18:52]

yes, it's safe (AFAIK) to just call

  data_source_->AddBoolean("isUserSignedIn", signed_in);

that's what I'm doing in MdHistoryUI when a promo is viewed

[lshang, 2016/09/23 02:00:01]

Yeah we should register a new message callback to handle this in MDHistoryUI~

                                          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);
 }