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

10 files changed, 47 insertions, 40 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index c68300d..934ba8e 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -653,7 +653,11 @@ void Browser::UpdateCommandsForFullscreenMode(bool is_fullscreen) {
   command_updater_.UpdateCommandEnabled(IDC_REPORT_BUG, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_BAR, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS, show_main_ui);
-  command_updater_.UpdateCommandEnabled(IDC_SYNC_BOOKMARKS, show_main_ui);
+#if defined(BROWSER_SYNC)
+  command_updater_.UpdateCommandEnabled(
+      IDC_SYNC_BOOKMARKS,
+      show_main_ui && profile_->GetProfileSyncService() != NULL);
+#endif
   command_updater_.UpdateCommandEnabled(IDC_OPTIONS, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_EDIT_SEARCH_ENGINES, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_VIEW_PASSWORDS, show_main_ui);
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));
     }
diff --git a/chrome/browser/gtk/sync_setup_wizard_gtk.cc b/chrome/browser/gtk/sync_setup_wizard_gtk.cc
index 01c4634..0bb8e61 100644
--- a/chrome/browser/gtk/sync_setup_wizard_gtk.cc
+++ b/chrome/browser/gtk/sync_setup_wizard_gtk.cc
@@ -29,6 +29,7 @@ void SyncSetupWizard::Step(State advance_state) {
     case MERGE_AND_SYNC:
     case FATAL_ERROR:
     case DONE:
+    case DONE_FIRST_TIME:
       // TODO(zork): Implement
       break;
     default:
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index b8af2e9..e44a61c 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -1355,7 +1355,7 @@ void ProfileImpl::StopCreateSessionServiceTimer() {
 }
 
 ProfileSyncService* ProfileImpl::GetProfileSyncService() {
-#if defined(BROWSER_SYNC)
+#if defined(BROWSER_SYNC) && !defined(OS_POSIX)
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) {
     if (!sync_service_.get())
       InitSyncService();
diff --git a/chrome/browser/sync/sync_setup_wizard.h b/chrome/browser/sync/sync_setup_wizard.h
index cc7bd2b..7367b6c 100644
--- a/chrome/browser/sync/sync_setup_wizard.h
+++ b/chrome/browser/sync/sync_setup_wizard.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 
-#if defined(OS_LINUX)
+#if defined(TOOLKIT_GTK)
 typedef struct _GtkWidget GtkWidget;
 typedef struct _GtkWindow GtkWindow;
 #else
@@ -53,7 +53,7 @@ class SyncSetupWizard {
   // if various buttons in the UI should be enabled or disabled.
   bool IsVisible() const;
 
-#if defined(OS_LINUX)
+#if defined(TOOLKIT_GTK)
   void set_visible(bool visible) { visible_ = visible; }
 #endif
 
@@ -69,7 +69,7 @@ class SyncSetupWizard {
 
   ProfileSyncService* service_;
 
-#if defined(OS_LINUX)
+#if defined(TOOLKIT_GTK)
   bool visible_;
 #else
   // The use of ShowHtmlDialog and SyncSetupFlowContainer is disabled on Linux
diff --git a/chrome/browser/sync/sync_status_ui_helper.cc b/chrome/browser/sync/sync_status_ui_helper.cc
index abffddc..8ec8a17 100644
--- a/chrome/browser/sync/sync_status_ui_helper.cc
+++ b/chrome/browser/sync/sync_status_ui_helper.cc
@@ -17,50 +17,52 @@
 // status message and, if necessary, the text that should appear in the
 // re-login link.
 static void GetLabelsForAuthError(AuthErrorState auth_error,
-    ProfileSyncService* service, std::wstring* status_label,
-    std::wstring* link_label) {
+    ProfileSyncService* service, string16* status_label,
+    string16* link_label) {
   if (link_label)
-    link_label->assign(l10n_util::GetString(IDS_SYNC_RELOGIN_LINK_LABEL));
+    link_label->assign(l10n_util::GetStringUTF16(IDS_SYNC_RELOGIN_LINK_LABEL));
   if (auth_error == AUTH_ERROR_INVALID_GAIA_CREDENTIALS) {
     // If the user name is empty then the first login failed, otherwise the
     // credentials are out-of-date.
     if (service->GetAuthenticatedUsername().empty())
       status_label->assign(
-          l10n_util::GetString(IDS_SYNC_INVALID_USER_CREDENTIALS));
+          l10n_util::GetStringUTF16(IDS_SYNC_INVALID_USER_CREDENTIALS));
     else
       status_label->assign(
-          l10n_util::GetString(IDS_SYNC_LOGIN_INFO_OUT_OF_DATE));
+          l10n_util::GetStringUTF16(IDS_SYNC_LOGIN_INFO_OUT_OF_DATE));
   } else if (auth_error == AUTH_ERROR_CONNECTION_FAILED) {
     // Note that there is little the user can do if the server is not
     // reachable. Since attempting to re-connect is done automatically by
     // the Syncer, we do not show the (re)login link.
     status_label->assign(
-        l10n_util::GetStringF(IDS_SYNC_SERVER_IS_UNREACHABLE,
-                              l10n_util::GetString(IDS_PRODUCT_NAME)));
+        l10n_util::GetStringFUTF16(IDS_SYNC_SERVER_IS_UNREACHABLE,
+                              l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
     if (link_label)
       link_label->clear();
   } else {
-    status_label->assign(l10n_util::GetString(IDS_SYNC_ERROR_SIGNING_IN));
+    status_label->assign(l10n_util::GetStringUTF16(IDS_SYNC_ERROR_SIGNING_IN));
   }
 }
 
 // Returns the message that should be displayed when the user is authenticated
 // and can connect to the sync server. If the user hasn't yet authenticated, an
 // empty string is returned.
-static std::wstring GetSyncedStateStatusLabel(ProfileSyncService* service) {
-  std::wstring label;
-  std::wstring user_name(UTF16ToWide(service->GetAuthenticatedUsername()));
+static string16 GetSyncedStateStatusLabel(ProfileSyncService* service) {
+  string16 label;
+  string16 user_name(service->GetAuthenticatedUsername());
   if (user_name.empty())
     return label;
 
-  return l10n_util::GetStringF(IDS_SYNC_ACCOUNT_SYNCED_TO_USER_WITH_TIME,
-                               user_name, service->GetLastSyncedTimeString());
+  return l10n_util::GetStringFUTF16(
+      IDS_SYNC_ACCOUNT_SYNCED_TO_USER_WITH_TIME,
+      user_name,
+      WideToUTF16(service->GetLastSyncedTimeString()));
 }
 
 // static
 SyncStatusUIHelper::MessageType SyncStatusUIHelper::GetLabels(
-    ProfileSyncService* service, std::wstring* status_label,
-    std::wstring* link_label) {
+    ProfileSyncService* service, string16* status_label,
+    string16* link_label) {
   MessageType result_type(SYNCED);
 
   if (!service) {
@@ -78,7 +80,8 @@ SyncStatusUIHelper::MessageType SyncStatusUIHelper::GetLabels(
       status_label->assign(GetSyncedStateStatusLabel(service));
       DCHECK_EQ(auth_error, AUTH_ERROR_NONE);
     } else if (service->UIShouldDepictAuthInProgress()) {
-      status_label->assign(l10n_util::GetString(IDS_SYNC_AUTHENTICATING_LABEL));
+      status_label->assign(
+          l10n_util::GetStringUTF16(IDS_SYNC_AUTHENTICATING_LABEL));
       result_type = PRE_SYNCED;
     } else if (auth_error != AUTH_ERROR_NONE) {
       GetLabelsForAuthError(auth_error, service, status_label, link_label);
@@ -92,23 +95,23 @@ SyncStatusUIHelper::MessageType SyncStatusUIHelper::GetLabels(
       ProfileSyncService::Status status(service->QueryDetailedSyncStatus());
       AuthErrorState auth_error(service->GetAuthErrorState());
       status_label->assign(
-          l10n_util::GetString(IDS_SYNC_NTP_SETUP_IN_PROGRESS));
+          l10n_util::GetStringUTF16(IDS_SYNC_NTP_SETUP_IN_PROGRESS));
       if (service->UIShouldDepictAuthInProgress()) {
         status_label->assign(
-            l10n_util::GetString(IDS_SYNC_AUTHENTICATING_LABEL));
+            l10n_util::GetStringUTF16(IDS_SYNC_AUTHENTICATING_LABEL));
       } else if (auth_error != AUTH_ERROR_NONE) {
         status_label->clear();
         GetLabelsForAuthError(auth_error, service, status_label, NULL);
         result_type = SYNC_ERROR;
       } else if (!status.authenticated) {
         status_label->assign(
-            l10n_util::GetString(IDS_SYNC_ACCOUNT_DETAILS_NOT_ENTERED));
+            l10n_util::GetStringUTF16(IDS_SYNC_ACCOUNT_DETAILS_NOT_ENTERED));
       }
     } else if (service->unrecoverable_error_detected()) {
       result_type = SYNC_ERROR;
-      status_label->assign(l10n_util::GetString(IDS_SYNC_SETUP_ERROR));
+      status_label->assign(l10n_util::GetStringUTF16(IDS_SYNC_SETUP_ERROR));
     } else {
-      status_label->assign(l10n_util::GetString(IDS_SYNC_NOT_SET_UP_INFO));
+      status_label->assign(l10n_util::GetStringUTF16(IDS_SYNC_NOT_SET_UP_INFO));
     }
   }
   return result_type;
diff --git a/chrome/browser/sync/sync_status_ui_helper.h b/chrome/browser/sync/sync_status_ui_helper.h
index f0d874b..e5da495 100644
--- a/chrome/browser/sync/sync_status_ui_helper.h
+++ b/chrome/browser/sync/sync_status_ui_helper.h
@@ -24,8 +24,8 @@ class SyncStatusUIHelper {
   // Create status and link labels for the current status labels and link text
   // by querying |service|.
   static MessageType GetLabels(ProfileSyncService* service,
-                               std::wstring* status_label,
-                               std::wstring* link_label);
+                               string16* status_label,
+                               string16* link_label);
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(SyncStatusUIHelper);
 };
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index 1eb8d63..2bb0fc8 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -1708,8 +1708,8 @@ gfx::Size BookmarkBarView::LayoutItems(bool compute_bounds_only) {
 bool BookmarkBarView::ShouldShowSyncErrorButton() {
   bool show_sync_error_button(false);
   if (sync_service_ && sync_service_->HasSyncSetupCompleted()) {
-    std::wstring status_text;
-    std::wstring link_text;
+    string16 status_text;
+    string16 link_text;
     SyncStatusUIHelper::MessageType sync_status;
     sync_status = SyncStatusUIHelper::GetLabels(
         sync_service_, &status_text, &link_text);
@@ -1737,4 +1737,3 @@ views::TextButton* BookmarkBarView::CreateSyncErrorButton() {
   return sync_error_button;
 }
 #endif  // defined(BROWSER_SYNC)
-
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 8853710..68159f8 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -1175,17 +1175,17 @@ void ToolbarView::CreateAppMenu() {
   app_menu_contents_->AddSeparator();
 #if defined(BROWSER_SYNC)
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) {
-    std::wstring label;
-    std::wstring link;
+    string16 label;
+    string16 link;
     // TODO(timsteele): Need a ui helper method to just get the type without
     // needing labels.
     SyncStatusUIHelper::MessageType type = SyncStatusUIHelper::GetLabels(
         browser_->profile()->GetProfileSyncService(), &label, &link);
     label = type == SyncStatusUIHelper::SYNCED ?
-        l10n_util::GetString(IDS_SYNC_MENU_BOOKMARKS_SYNCED_LABEL) :
+        l10n_util::GetStringUTF16(IDS_SYNC_MENU_BOOKMARKS_SYNCED_LABEL) :
         type == SyncStatusUIHelper::SYNC_ERROR ?
-        l10n_util::GetString(IDS_SYNC_MENU_BOOKMARK_SYNC_ERROR_LABEL) :
-        l10n_util::GetString(IDS_SYNC_START_SYNC_BUTTON_LABEL);
+        l10n_util::GetStringUTF16(IDS_SYNC_MENU_BOOKMARK_SYNC_ERROR_LABEL) :
+        l10n_util::GetStringUTF16(IDS_SYNC_START_SYNC_BUTTON_LABEL);
     app_menu_contents_->AddItem(IDC_SYNC_BOOKMARKS, label);
     app_menu_contents_->AddSeparator();
   }