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

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

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 // entries, or for the starred folder. 402 // entries, or for the starred folder.
403 BookmarkMenuController* bookmark_menu_; 403 BookmarkMenuController* bookmark_menu_;
404 404
405 // Used when showing a menu for drag and drop. That is, if the user drags 405 // Used when showing a menu for drag and drop. That is, if the user drags
406 // over a folder this becomes non-null and manages the menu showing the 406 // over a folder this becomes non-null and manages the menu showing the
407 // contents of the node. 407 // contents of the node.
408 BookmarkMenuController* bookmark_drop_menu_; 408 BookmarkMenuController* bookmark_drop_menu_;
409 409
410 // If non-NULL we're showing a context menu for one of the items on the 410 // If non-NULL we're showing a context menu for one of the items on the
411 // bookmark bar. 411 // bookmark bar.
412 scoped_ptr<BookmarkContextMenu> context_menu_; 412 std::unique_ptr<BookmarkContextMenu> context_menu_;
413 413
414 // Shows the "Other Bookmarks" folder button. 414 // Shows the "Other Bookmarks" folder button.
415 views::MenuButton* other_bookmarks_button_; 415 views::MenuButton* other_bookmarks_button_;
416 416
417 // Shows the managed bookmarks entries. 417 // Shows the managed bookmarks entries.
418 views::MenuButton* managed_bookmarks_button_; 418 views::MenuButton* managed_bookmarks_button_;
419 419
420 // Shows the supervised bookmarks entries. 420 // Shows the supervised bookmarks entries.
421 views::MenuButton* supervised_bookmarks_button_; 421 views::MenuButton* supervised_bookmarks_button_;
422 422
423 // Shows the Apps page shortcut. 423 // Shows the Apps page shortcut.
424 views::LabelButton* apps_page_shortcut_; 424 views::LabelButton* apps_page_shortcut_;
425 425
426 // Used to track drops on the bookmark bar view. 426 // Used to track drops on the bookmark bar view.
427 scoped_ptr<DropInfo> drop_info_; 427 std::unique_ptr<DropInfo> drop_info_;
428 428
429 // Visible if not all the bookmark buttons fit. 429 // Visible if not all the bookmark buttons fit.
430 views::MenuButton* overflow_button_; 430 views::MenuButton* overflow_button_;
431 431
432 // Shows a text and a link to import bookmarks if there are no bookmarks in 432 // Shows a text and a link to import bookmarks if there are no bookmarks in
433 // the Bookmarks Bar. 433 // the Bookmarks Bar.
434 views::View* instructions_; 434 views::View* instructions_;
435 435
436 ButtonSeparatorView* bookmarks_separator_view_; 436 ButtonSeparatorView* bookmarks_separator_view_;
437 437
(...skipping 18 matching lines...) Expand all
456 456
457 base::ObserverList<BookmarkBarViewObserver> observers_; 457 base::ObserverList<BookmarkBarViewObserver> observers_;
458 458
459 // Factory used to delay showing of the drop menu. 459 // Factory used to delay showing of the drop menu.
460 base::WeakPtrFactory<BookmarkBarView> show_folder_method_factory_; 460 base::WeakPtrFactory<BookmarkBarView> show_folder_method_factory_;
461 461
462 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView); 462 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView);
463 }; 463 };
464 464
465 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ 465 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bar_control_button.h ('k') | chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698