| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| 11 #include "base/basictypes.h" |
| 11 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
| 12 #include "base/gtest_prod_util.h" | 13 #include "base/gtest_prod_util.h" |
| 13 #include "base/task.h" | 14 #include "base/memory/weak_ptr.h" |
| 14 #include "chrome/browser/bookmarks/bookmark_model_observer.h" | 15 #include "chrome/browser/bookmarks/bookmark_model_observer.h" |
| 15 #include "chrome/browser/bookmarks/bookmark_node_data.h" | 16 #include "chrome/browser/bookmarks/bookmark_node_data.h" |
| 16 #include "chrome/browser/sync/profile_sync_service.h" | 17 #include "chrome/browser/sync/profile_sync_service.h" |
| 17 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" | 18 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" |
| 18 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h" | 19 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h" |
| 19 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" | 20 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" |
| 20 #include "chrome/browser/ui/views/detachable_toolbar_view.h" | 21 #include "chrome/browser/ui/views/detachable_toolbar_view.h" |
| 21 #include "content/common/notification_registrar.h" | 22 #include "content/common/notification_registrar.h" |
| 22 #include "ui/base/animation/animation_delegate.h" | 23 #include "ui/base/animation/animation_delegate.h" |
| 23 #include "views/context_menu_controller.h" | 24 #include "views/context_menu_controller.h" |
| (...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 375 BookmarkMenuController* bookmark_drop_menu_; | 376 BookmarkMenuController* bookmark_drop_menu_; |
| 376 | 377 |
| 377 // If non-NULL we're showing a context menu for one of the items on the | 378 // If non-NULL we're showing a context menu for one of the items on the |
| 378 // bookmark bar. | 379 // bookmark bar. |
| 379 scoped_ptr<BookmarkContextMenu> context_menu_; | 380 scoped_ptr<BookmarkContextMenu> context_menu_; |
| 380 | 381 |
| 381 // Shows the other bookmark entries. | 382 // Shows the other bookmark entries. |
| 382 views::MenuButton* other_bookmarked_button_; | 383 views::MenuButton* other_bookmarked_button_; |
| 383 | 384 |
| 384 // Task used to delay showing of the drop menu. | 385 // Task used to delay showing of the drop menu. |
| 385 ScopedRunnableMethodFactory<BookmarkBarView> show_folder_method_factory_; | 386 base::WeakPtrFactory<BookmarkBarView> show_folder_method_factory_; |
| 386 | 387 |
| 387 // Used to track drops on the bookmark bar view. | 388 // Used to track drops on the bookmark bar view. |
| 388 scoped_ptr<DropInfo> drop_info_; | 389 scoped_ptr<DropInfo> drop_info_; |
| 389 | 390 |
| 390 // The sync re-login indicator which appears when the user needs to re-enter | 391 // The sync re-login indicator which appears when the user needs to re-enter |
| 391 // credentials in order to continue syncing. | 392 // credentials in order to continue syncing. |
| 392 views::TextButton* sync_error_button_; | 393 views::TextButton* sync_error_button_; |
| 393 | 394 |
| 394 // A pointer to the ProfileSyncService instance if one exists. | 395 // A pointer to the ProfileSyncService instance if one exists. |
| 395 ProfileSyncService* sync_service_; | 396 ProfileSyncService* sync_service_; |
| (...skipping 23 matching lines...) Expand all Loading... |
| 419 | 420 |
| 420 BookmarkBar::State bookmark_bar_state_; | 421 BookmarkBar::State bookmark_bar_state_; |
| 421 | 422 |
| 422 // Are we animating to or from the detached state? | 423 // Are we animating to or from the detached state? |
| 423 bool animating_detached_; | 424 bool animating_detached_; |
| 424 | 425 |
| 425 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView); | 426 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView); |
| 426 }; | 427 }; |
| 427 | 428 |
| 428 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ | 429 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ |
| OLD | NEW |