Resubmit http://codereview.chromium.org/314016 with views fixed

Review URL: http://codereview.chromium.org/338008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30106 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 4 deletions

diff --git a/chrome/browser/dom_ui/new_tab_page_sync_handler.cc b/chrome/browser/dom_ui/new_tab_page_sync_handler.cc
index ff63cf6..c792445 100644
--- a/chrome/browser/dom_ui/new_tab_page_sync_handler.cc
+++ b/chrome/browser/dom_ui/new_tab_page_sync_handler.cc
@@ -145,12 +145,12 @@ void NewTabPageSyncHandler::BuildAndSendSyncStatus() {
   // "Sync error", when we can't authenticate or establish a connection with
   //               the sync server (appropriate information appended to
   //               message).
-  std::wstring status_msg;
-  std::wstring link_text;
+  string16 status_msg;
+  string16 link_text;
   SyncStatusUIHelper::MessageType type =
       SyncStatusUIHelper::GetLabels(sync_service_, &status_msg, &link_text);
   SendSyncMessageToPage(FromSyncStatusMessageType(type),
-                        WideToUTF8(status_msg), WideToUTF8(link_text));
+                        UTF16ToUTF8(status_msg), UTF16ToUTF8(link_text));
 }
 
 void NewTabPageSyncHandler::HandleSyncLinkClicked(const Value* value) {
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc
index 2a418c9..1e3bfa7 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -561,7 +561,7 @@ NewTabUI::NewTabUI(TabContents* contents)
     if (WebResourcesEnabled())
       AddMessageHandler((new TipsHandler())->Attach(this));
 
-#if defined(BROWSER_SYNC)
+#if defined(BROWSER_SYNC) && !defined(OS_POSIX)
     if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) {
       AddMessageHandler((new NewTabPageSyncHandler())->Attach(this));
     }