Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / signin_internals_ui.cc

diff --git a/src/chrome/browser/ui/webui/signin_internals_ui.cc b/src/chrome/browser/ui/webui/signin_internals_ui.cc
index 304d1cd..322f1ec 100644 (file)
--- a/src/chrome/browser/ui/webui/signin_internals_ui.cc
+++ b/src/chrome/browser/ui/webui/signin_internals_ui.cc
@@ -6,13 +6,12 @@
 
 #include "base/hash.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/signin/about_signin_internals.h"
 #include "chrome/browser/signin/about_signin_internals_factory.h"
 #include "chrome/common/url_constants.h"
+#include "components/signin/core/browser/about_signin_internals.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "grit/signin_internals_resources.h"
-#include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
@@ -21,8 +20,7 @@ content::WebUIDataSource* CreateSignInInternalsHTMLSource() {
       content::WebUIDataSource::Create(chrome::kChromeUISignInInternalsHost);
 
   source->SetJsonPath("strings.js");
-  source->AddResourcePath("signin_internals.js",
-                            IDR_SIGNIN_INTERNALS_INDEX_JS);
+  source->AddResourcePath("signin_internals.js", IDR_SIGNIN_INTERNALS_INDEX_JS);
   source->SetDefaultResource(IDR_SIGNIN_INTERNALS_INDEX_HTML);
   return source;
 }
@@ -68,10 +66,10 @@ bool SignInInternalsUI::OverrideHandleWebUIMessage(
     // empty in incognito mode. Alternatively, we could force about:signin to
     // open in non-incognito mode always (like about:settings for ex.).
     if (about_signin_internals) {
-      const std::string& reply_handler =
-          "chrome.signin.getSigninInfo.handleReply";
       web_ui()->CallJavascriptFunction(
-          reply_handler, *about_signin_internals->GetSigninStatus());
+          "chrome.signin.getSigninInfo.handleReply",
+          *about_signin_internals->GetSigninStatus());
+      about_signin_internals->GetCookieAccountsAsync();
 
       return true;
     }
@@ -80,7 +78,13 @@ bool SignInInternalsUI::OverrideHandleWebUIMessage(
 }
 
 void SignInInternalsUI::OnSigninStateChanged(
-    scoped_ptr<base::DictionaryValue> info) {
-  const std::string& event_handler = "chrome.signin.onSigninInfoChanged.fire";
-  web_ui()->CallJavascriptFunction(event_handler, *info);
+    const base::DictionaryValue* info) {
+  web_ui()->CallJavascriptFunction(
+      "chrome.signin.onSigninInfoChanged.fire", *info);
+}
+
+void SignInInternalsUI::OnCookieAccountsFetched(
+    const base::DictionaryValue* info) {
+  web_ui()->CallJavascriptFunction(
+      "chrome.signin.onCookieAccountsFetched.fire", *info);
 }