| Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
|
| diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
|
| index cec63782b1178e7a7d6bf63503af94cf41088ab0..65d53d7229bb84e4a10fdbc319534028c29c26cb 100644
|
| --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
|
| +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
|
| @@ -14,11 +14,11 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "chrome/browser/bookmarks/bookmark_model_observer.h"
|
| #include "chrome/browser/bookmarks/bookmark_node_data.h"
|
| -#include "chrome/browser/sync/profile_sync_service.h"
|
| #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
|
| #include "chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h"
|
| #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h"
|
| #include "chrome/browser/ui/views/detachable_toolbar_view.h"
|
| +#include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| #include "ui/base/animation/animation_delegate.h"
|
| #include "views/context_menu_controller.h"
|
| @@ -50,7 +50,6 @@ class TextButton;
|
| // waits until the HistoryService for the profile has been loaded before
|
| // creating the BookmarkModel.
|
| class BookmarkBarView : public DetachableToolbarView,
|
| - public ProfileSyncServiceObserver,
|
| public BookmarkModelObserver,
|
| public views::ViewMenuDelegate,
|
| public views::ButtonListener,
|
| @@ -179,9 +178,6 @@ class BookmarkBarView : public DetachableToolbarView,
|
| // AccessiblePaneView methods:
|
| virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
|
|
|
| - // ProfileSyncServiceObserver method.
|
| - virtual void OnStateChanged() OVERRIDE;
|
| -
|
| // SlideAnimationDelegate implementation.
|
| virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
|
| virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
|
| @@ -289,9 +285,6 @@ class BookmarkBarView : public DetachableToolbarView,
|
| // Creates the button used when not all bookmark buttons fit.
|
| views::MenuButton* CreateOverflowButton();
|
|
|
| - // Creates the sync error button and adds it as a child view.
|
| - views::TextButton* CreateSyncErrorButton();
|
| -
|
| // Creates the button for rendering the specified bookmark node.
|
| views::View* CreateBookmarkButton(const BookmarkNode* node);
|
|
|
| @@ -388,13 +381,6 @@ class BookmarkBarView : public DetachableToolbarView,
|
| // Used to track drops on the bookmark bar view.
|
| scoped_ptr<DropInfo> drop_info_;
|
|
|
| - // The sync re-login indicator which appears when the user needs to re-enter
|
| - // credentials in order to continue syncing.
|
| - views::TextButton* sync_error_button_;
|
| -
|
| - // A pointer to the ProfileSyncService instance if one exists.
|
| - ProfileSyncService* sync_service_;
|
| -
|
| // Visible if not all the bookmark buttons fit.
|
| views::MenuButton* overflow_button_;
|
|
|
|
|