sync: Show the expired credential errors in the Bookmark Manager.

chrome/browser/views/bookmark_manager_view.cc

 // Copyright (c) 2009 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/views/bookmark_manager_view.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
+#include "app/resource_bundle.h"
 #include "base/keyboard_codes.h"
 #include "base/thread.h"
 #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h"
 #include "chrome/browser/bookmarks/bookmark_html_writer.h"
 #include "chrome/browser/bookmarks/bookmark_manager.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_table_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/views/bookmark_editor_view.h"
 #include "chrome/browser/views/bookmark_folder_tree_view.h"
 #include "chrome/browser/views/bookmark_table_view.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "grit/theme_resources.h"
 #include "skia/ext/skia_utils.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/label.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/single_split_view.h"
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
@@ skipping 116 matching lines @@
 }
 
 // -----------------------------------------------------------------------------
 
 BookmarkManagerView::BookmarkManagerView(Profile* profile)
     : profile_(profile->GetOriginalProfile()),
       table_view_(NULL),
       tree_view_(NULL),
       sync_status_button_(NULL),
       sync_service_(NULL),
+      sync_relogin_required_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(search_factory_(this)) {
   search_tf_ = new views::Textfield();
   search_tf_->set_default_width_in_chars(30);
 
   table_view_ = new BookmarkTableView(profile_, NULL);
   table_view_->SetObserver(this);
   table_view_->SetContextMenuController(this);
 
   tree_view_ = new BookmarkFolderTreeView(profile_, NULL);
   tree_view_->SetController(this);
@@ skipping 325 matching lines @@
 
     default:
       OnCutCopyPaste(KeyCodeToCutCopyPaste(keycode), false);
       break;
   }
 }
 
 void BookmarkManagerView::ButtonPressed(views::Button* sender,
                                         const views::Event& event) {
   if (sender == sync_status_button_) {
-    UserMetrics::RecordAction("BookmarkManager_Sync", profile_);
-    sync_ui_util::OpenSyncMyBookmarksDialog(
-        profile_, ProfileSyncService::START_FROM_BOOKMARK_MANAGER);
+    if (sync_relogin_required_) {
+      DCHECK(sync_service_);
+      sync_service_->ShowLoginDialog();
+    } else {
+      UserMetrics::RecordAction("BookmarkManager_Sync", profile_);
+      sync_ui_util::OpenSyncMyBookmarksDialog(
+          profile_, ProfileSyncService::START_FROM_BOOKMARK_MANAGER);
+    }
   }
 }
 
 void BookmarkManagerView::Loaded(BookmarkModel* model) {
   model->RemoveObserver(this);
   LoadedImpl();
 }
 
 void BookmarkManagerView::ContentsChanged(views::Textfield* sender,
                                           const std::wstring& new_contents) {
@@ skipping 282 matching lines @@
   select_file_dialog_ = SelectFileDialog::Create(this);
   select_file_dialog_->SelectFile(
       SelectFileDialog::SELECT_SAVEAS_FILE, std::wstring(),
       FilePath(FILE_PATH_LITERAL("bookmarks.html")), &file_type_info, 0,
       L"html", GetWidget()->GetNativeView(),
       reinterpret_cast<void*>(IDS_BOOKMARK_MANAGER_EXPORT_MENU));
 }
 
 void BookmarkManagerView::UpdateSyncStatus() {
   DCHECK(sync_service_);
-  std::wstring status_label;
-  std::wstring link_label;
-  bool synced = sync_ui_util::GetStatusLabels(sync_service_,
-      &status_label, &link_label) == sync_ui_util::SYNCED;
+  string16 status_label;
+  string16 link_label;
+  sync_relogin_required_ = sync_ui_util::GetStatusLabels(sync_service_,
+      &status_label, &link_label) == sync_ui_util::SYNC_ERROR;
+
+  if (sync_relogin_required_) {
+    sync_status_button_->SetText(
+        l10n_util::GetString(IDS_SYNC_BOOKMARK_BAR_ERROR));
+    // The tooltip is the only way we have to display text explaining the error
+    // to the user.
+    sync_status_button_->SetTooltipText(
+        l10n_util::GetString(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC));
+    sync_status_button_->SetAccessibleName(
+        l10n_util::GetString(IDS_ACCNAME_SYNC_ERROR_BUTTON));
+    sync_status_button_->SetIcon(
+        *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING));
+    sync_status_button_->GetParent()->Layout();
+    return;
+  }
 
   if (sync_service_->HasSyncSetupCompleted()) {
-    std::wstring username = sync_service_->GetAuthenticatedUsername();
-    status_label = l10n_util::GetStringF(IDS_SYNC_NTP_SYNCED_TO, username);
-  } else if (!sync_service_->SetupInProgress() && !synced) {
+      std::wstring username = sync_service_->GetAuthenticatedUsername();
+      status_label = l10n_util::GetStringF(IDS_SYNC_NTP_SYNCED_TO, username);
+  } else if (sync_service_->SetupInProgress()) {
+    status_label = l10n_util::GetString(IDS_SYNC_NTP_SETUP_IN_PROGRESS);
+  } else {
     status_label = l10n_util::GetString(IDS_SYNC_START_SYNC_BUTTON_LABEL);
   }
   sync_status_button_->SetText(status_label);
+  sync_status_button_->SetTooltipText(L"");
+  sync_status_button_->SetAccessibleName(L"");
+  sync_status_button_->SetIcon(SkBitmap());
   sync_status_button_->GetParent()->Layout();
 }