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

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

Issue 1203713002: Limit access to ChromeBookmarkClient to bookmarks code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup_bookmark_client
Patch Set: Rebase Created 5 years, 6 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 15 matching lines...) Expand all
26 #include "ui/views/controls/button/button.h" 26 #include "ui/views/controls/button/button.h"
27 #include "ui/views/controls/button/menu_button_listener.h" 27 #include "ui/views/controls/button/menu_button_listener.h"
28 #include "ui/views/controls/menu/menu_types.h" 28 #include "ui/views/controls/menu/menu_types.h"
29 #include "ui/views/drag_controller.h" 29 #include "ui/views/drag_controller.h"
30 30
31 class BookmarkBarViewObserver; 31 class BookmarkBarViewObserver;
32 class BookmarkBarViewTestHelper; 32 class BookmarkBarViewTestHelper;
33 class BookmarkContextMenu; 33 class BookmarkContextMenu;
34 class Browser; 34 class Browser;
35 class BrowserView; 35 class BrowserView;
36 class ChromeBookmarkClient;
37 class Profile; 36 class Profile;
38 37
39 namespace bookmarks { 38 namespace bookmarks {
40 class BookmarkModel; 39 class BookmarkModel;
41 } 40 }
42 41
43 namespace content { 42 namespace content {
44 class PageNavigator; 43 class PageNavigator;
45 } 44 }
46 45
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 // Needed to react to kShowAppsShortcutInBookmarkBar changes. 394 // Needed to react to kShowAppsShortcutInBookmarkBar changes.
396 PrefChangeRegistrar profile_pref_registrar_; 395 PrefChangeRegistrar profile_pref_registrar_;
397 396
398 // Used for opening urls. 397 // Used for opening urls.
399 content::PageNavigator* page_navigator_; 398 content::PageNavigator* page_navigator_;
400 399
401 // BookmarkModel that owns the entries and folders that are shown in this 400 // BookmarkModel that owns the entries and folders that are shown in this
402 // view. This is owned by the Profile. 401 // view. This is owned by the Profile.
403 bookmarks::BookmarkModel* model_; 402 bookmarks::BookmarkModel* model_;
404 403
405 // ChromeBookmarkClient. This is owned by the Profile.
406 ChromeBookmarkClient* client_;
407
408 // Used to manage showing a Menu, either for the most recently bookmarked 404 // Used to manage showing a Menu, either for the most recently bookmarked
409 // entries, or for the starred folder. 405 // entries, or for the starred folder.
410 BookmarkMenuController* bookmark_menu_; 406 BookmarkMenuController* bookmark_menu_;
411 407
412 // Used when showing a menu for drag and drop. That is, if the user drags 408 // Used when showing a menu for drag and drop. That is, if the user drags
413 // over a folder this becomes non-null and manages the menu showing the 409 // over a folder this becomes non-null and manages the menu showing the
414 // contents of the node. 410 // contents of the node.
415 BookmarkMenuController* bookmark_drop_menu_; 411 BookmarkMenuController* bookmark_drop_menu_;
416 412
417 // If non-NULL we're showing a context menu for one of the items on the 413 // If non-NULL we're showing a context menu for one of the items on the
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 459
464 base::ObserverList<BookmarkBarViewObserver> observers_; 460 base::ObserverList<BookmarkBarViewObserver> observers_;
465 461
466 // Factory used to delay showing of the drop menu. 462 // Factory used to delay showing of the drop menu.
467 base::WeakPtrFactory<BookmarkBarView> show_folder_method_factory_; 463 base::WeakPtrFactory<BookmarkBarView> show_folder_method_factory_;
468 464
469 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView); 465 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView);
470 }; 466 };
471 467
472 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ 468 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698