| 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 2ac34a9a7797ae34a07e89b7acb4939d9b1e8a9d..33861c5c5404e2307ac5e4cdbe5ef3eeb0ab307a 100644
|
| --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
|
| +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
|
| @@ -15,7 +15,7 @@
|
| #include "chrome/browser/bookmarks/bookmark_model_observer.h"
|
| #include "chrome/browser/bookmarks/bookmark_node_data.h"
|
| #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
|
| -#include "chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h"
|
| +#include "chrome/browser/ui/bookmarks/bookmark_bar_instructions_delegate.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"
|
| @@ -61,7 +61,7 @@ class BookmarkBarView : public DetachableToolbarView,
|
| public views::DragController,
|
| public ui::AnimationDelegate,
|
| public BookmarkMenuController::Observer,
|
| - public BookmarkBarInstructionsView::Delegate {
|
| + public chrome::BookmarkBarInstructionsDelegate {
|
| public:
|
| // The internal view class name.
|
| static const char kViewClassName[];
|
| @@ -179,18 +179,18 @@ class BookmarkBarView : public DetachableToolbarView,
|
| virtual void OnThemeChanged() OVERRIDE;
|
| virtual std::string GetClassName() const OVERRIDE;
|
|
|
| - // AccessiblePaneView methods:
|
| + // AccessiblePaneView:
|
| virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
|
|
|
| - // SlideAnimationDelegate implementation.
|
| + // ui::AnimationDelegate:
|
| virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
|
| virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
|
|
|
| - // BookmarkMenuController::Observer
|
| + // BookmarkMenuController::Observer:
|
| virtual void BookmarkMenuDeleted(
|
| BookmarkMenuController* controller) OVERRIDE;
|
|
|
| - // BookmarkBarInstructionsView::Delegate.
|
| + // chrome::BookmarkBarInstructionsDelegate:
|
| virtual void ShowImportDialog() OVERRIDE;
|
|
|
| // BookmarkModelObserver:
|
|
|