Manually merge r33152 into the 249 branch. The merge could not be done automa...

chrome/browser/views/bookmark_manager_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_BOOKMARK_MANAGER_VIEW_H_
 #define CHROME_BROWSER_VIEWS_BOOKMARK_MANAGER_VIEW_H_
 
 #include "base/keyboard_codes.h"
 #include "base/ref_counted.h"
 #include "base/task.h"
@@ skipping 211 matching lines @@
   // Import/export file dialog.
   scoped_refptr<SelectFileDialog> select_file_dialog_;
 
   // The sync status button that notifies the user about the current status of
   // bookmarks synchronization.
   views::TextButton* sync_status_button_;
 
   // A pointer to the ProfileSyncService instance if one exists.
   ProfileSyncService* sync_service_;
 
+  // True if the cached credentials have expired and we need to prompt the
+  // user to re-enter their password.
+  bool sync_relogin_required_;
+
   // Factory used for delaying search.
   ScopedRunnableMethodFactory<BookmarkManagerView> search_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkManagerView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_BOOKMARK_MANAGER_VIEW_H_