Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(376)

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view.h

Issue 7787001: Makes bookmark bar view reset PageNavigator on menu when PageNavigator (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/gtest_prod_util.h" 12 #include "base/gtest_prod_util.h"
13 #include "base/task.h" 13 #include "base/task.h"
14 #include "chrome/browser/bookmarks/bookmark_model_observer.h" 14 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
15 #include "chrome/browser/bookmarks/bookmark_node_data.h" 15 #include "chrome/browser/bookmarks/bookmark_node_data.h"
16 #include "chrome/browser/sync/profile_sync_service.h" 16 #include "chrome/browser/sync/profile_sync_service.h"
17 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" 17 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
18 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h" 18 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h"
19 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" 19 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h"
20 #include "chrome/browser/ui/views/detachable_toolbar_view.h" 20 #include "chrome/browser/ui/views/detachable_toolbar_view.h"
21 #include "content/common/notification_registrar.h" 21 #include "content/common/notification_registrar.h"
22 #include "ui/base/animation/animation_delegate.h" 22 #include "ui/base/animation/animation_delegate.h"
23 #include "views/context_menu_controller.h" 23 #include "views/context_menu_controller.h"
24 #include "views/controls/button/button.h" 24 #include "views/controls/button/button.h"
25 #include "views/controls/menu/view_menu_delegate.h" 25 #include "views/controls/menu/view_menu_delegate.h"
26 #include "views/drag_controller.h" 26 #include "views/drag_controller.h"
27 27
28 class BookmarkContextMenu;
28 class Browser; 29 class Browser;
29 class PageNavigator; 30 class PageNavigator;
30 class PrefService; 31 class PrefService;
31 32
32 namespace ui { 33 namespace ui {
33 class SlideAnimation; 34 class SlideAnimation;
34 } 35 }
35 36
36 namespace views { 37 namespace views {
37 class CustomButton; 38 class CustomButton;
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 368
368 // Used to manage showing a Menu, either for the most recently bookmarked 369 // Used to manage showing a Menu, either for the most recently bookmarked
369 // entries, or for the starred folder. 370 // entries, or for the starred folder.
370 BookmarkMenuController* bookmark_menu_; 371 BookmarkMenuController* bookmark_menu_;
371 372
372 // Used when showing a menu for drag and drop. That is, if the user drags 373 // Used when showing a menu for drag and drop. That is, if the user drags
373 // over a folder this becomes non-null and manages the menu showing the 374 // over a folder this becomes non-null and manages the menu showing the
374 // contents of the node. 375 // contents of the node.
375 BookmarkMenuController* bookmark_drop_menu_; 376 BookmarkMenuController* bookmark_drop_menu_;
376 377
378 // If non-NULL we're showing a context menu for one of the items on the
379 // bookmark bar.
380 scoped_ptr<BookmarkContextMenu> context_menu_;
381
377 // Shows the other bookmark entries. 382 // Shows the other bookmark entries.
378 views::MenuButton* other_bookmarked_button_; 383 views::MenuButton* other_bookmarked_button_;
379 384
380 // Task used to delay showing of the drop menu. 385 // Task used to delay showing of the drop menu.
381 ScopedRunnableMethodFactory<BookmarkBarView> show_folder_method_factory_; 386 ScopedRunnableMethodFactory<BookmarkBarView> show_folder_method_factory_;
382 387
383 // Used to track drops on the bookmark bar view. 388 // Used to track drops on the bookmark bar view.
384 scoped_ptr<DropInfo> drop_info_; 389 scoped_ptr<DropInfo> drop_info_;
385 390
386 // 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
(...skipping 28 matching lines...) Expand all
415 420
416 BookmarkBar::State bookmark_bar_state_; 421 BookmarkBar::State bookmark_bar_state_;
417 422
418 // Are we animating to or from the detached state? 423 // Are we animating to or from the detached state?
419 bool animating_detached_; 424 bool animating_detached_;
420 425
421 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView); 426 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView);
422 }; 427 };
423 428
424 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ 429 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698