Upstream version 10.39.225.0

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

diff --git a/src/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc b/src/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc
index 74ab381..32f3dbb 100644 (file)
--- a/src/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc
+++ b/src/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc
@@ -13,9 +13,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/sync/profile_sync_service.h"
@@ -26,9 +24,10 @@
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/grit/generated_resources.h"
+#include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_ui.h"
-#include "grit/generated_resources.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/url_request/url_request_context.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -77,7 +76,7 @@ void NewTabPageSyncHandler::RegisterMessages() {
                  base::Unretained(this)));
 }
 
-void NewTabPageSyncHandler::HandleGetSyncMessage(const ListValue* args) {
+void NewTabPageSyncHandler::HandleGetSyncMessage(const base::ListValue* args) {
   waiting_for_initial_page_load_ = false;
   BuildAndSendSyncStatus();
 }
@@ -111,8 +110,8 @@ void NewTabPageSyncHandler::BuildAndSendSyncStatus() {
   // "Sync error", when we can't authenticate or establish a connection with
   //               the sync server (appropriate information appended to
   //               message).
-  string16 status_msg;
-  string16 link_text;
+  base::string16 status_msg;
+  base::string16 link_text;
 
   sync_ui_util::MessageType type =
       sync_ui_util::GetStatusLabelsForNewTabPage(sync_service_,
@@ -120,10 +119,11 @@ void NewTabPageSyncHandler::BuildAndSendSyncStatus() {
                                                  &status_msg,
                                                  &link_text);
   SendSyncMessageToPage(FromSyncStatusMessageType(type),
-                        UTF16ToUTF8(status_msg), UTF16ToUTF8(link_text));
+                        base::UTF16ToUTF8(status_msg),
+                        base::UTF16ToUTF8(link_text));
 }
 
-void NewTabPageSyncHandler::HandleSyncLinkClicked(const ListValue* args) {
+void NewTabPageSyncHandler::HandleSyncLinkClicked(const base::ListValue* args) {
   DCHECK(!waiting_for_initial_page_load_);
   if (!sync_service_ || !sync_service_->IsSyncEnabled())
     return;
@@ -134,9 +134,9 @@ void NewTabPageSyncHandler::HandleSyncLinkClicked(const ListValue* args) {
   chrome::ShowBrowserSignin(browser, signin::SOURCE_NTP_LINK);
 
   if (sync_service_->HasSyncSetupCompleted()) {
-    string16 user = UTF8ToUTF16(SigninManagerFactory::GetForProfile(
+    base::string16 user = base::UTF8ToUTF16(SigninManagerFactory::GetForProfile(
         Profile::FromWebUI(web_ui()))->GetAuthenticatedUsername());
-    DictionaryValue value;
+    base::DictionaryValue value;
     value.SetString("syncEnabledMessage",
                     l10n_util::GetStringFUTF16(IDS_SYNC_NTP_SYNCED_TO,
                     user));
@@ -163,7 +163,7 @@ void NewTabPageSyncHandler::OnSigninAllowedPrefChange() {
 void NewTabPageSyncHandler::SendSyncMessageToPage(
     MessageType type, std::string msg,
     std::string linktext) {
-  DictionaryValue value;
+  base::DictionaryValue value;
   std::string user;
   std::string title;
   std::string linkurl;