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

Unified Diff: chrome/browser/ui/toolbar/toolbar_actions_bar.cc

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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/toolbar/toolbar_actions_bar.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_bar.cc b/chrome/browser/ui/toolbar/toolbar_actions_bar.cc
index df3d508199e2154286d2989df0ea39aaa5c3270a..197fdcf24705fb88179ca3b002056c181c2fe944 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_bar.cc
+++ b/chrome/browser/ui/toolbar/toolbar_actions_bar.cc
@@ -391,7 +391,7 @@ void ToolbarActionsBar::CreateActions() {
checked_extension_bubble_ = true;
// CreateActions() can be called as part of the browser window set up, which
// we need to let finish before showing the actions.
- scoped_ptr<extensions::ExtensionMessageBubbleController> controller =
+ std::unique_ptr<extensions::ExtensionMessageBubbleController> controller =
ExtensionMessageBubbleFactory(browser_).GetController();
if (controller) {
base::ThreadTaskRunnerHandle::Get()->PostTask(
@@ -580,7 +580,7 @@ void ToolbarActionsBar::RemoveObserver(ToolbarActionsBarObserver* observer) {
}
void ToolbarActionsBar::ShowToolbarActionBubble(
- scoped_ptr<ToolbarActionsBarBubbleDelegate> bubble) {
+ std::unique_ptr<ToolbarActionsBarBubbleDelegate> bubble) {
DCHECK(bubble->GetAnchorActionId().empty() ||
GetActionForId(bubble->GetAnchorActionId()));
if (delegate_->IsAnimating())
@@ -590,7 +590,7 @@ void ToolbarActionsBar::ShowToolbarActionBubble(
}
void ToolbarActionsBar::MaybeShowExtensionBubble(
- scoped_ptr<extensions::ExtensionMessageBubbleController> controller) {
+ std::unique_ptr<extensions::ExtensionMessageBubbleController> controller) {
controller->HighlightExtensionsIfNecessary(); // Safe to call multiple times.
if (delegate_->IsAnimating()) {
// If the toolbar is animating, we can't effectively anchor the bubble,
@@ -648,7 +648,7 @@ void ToolbarActionsBar::OnToolbarActionRemoved(const std::string& action_id) {
// The action should outlive the UI element (which is owned by the delegate),
// so we can't delete it just yet. But we should remove it from the list of
// actions so that any width calculations are correct.
- scoped_ptr<ToolbarActionViewController> removed_action(*iter);
+ std::unique_ptr<ToolbarActionViewController> removed_action(*iter);
toolbar_actions_.weak_erase(iter);
delegate_->RemoveViewForAction(removed_action.get());
removed_action.reset();
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_actions_bar.h ('k') | chrome/browser/ui/toolbar/toolbar_actions_bar_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698