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

Side by Side Diff: chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h" 5 #include "chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 9
10 class TestToolbarActionsBarBubbleDelegate::DelegateImpl 10 class TestToolbarActionsBarBubbleDelegate::DelegateImpl
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 action_(action) { 48 action_(action) {
49 } 49 }
50 50
51 TestToolbarActionsBarBubbleDelegate::~TestToolbarActionsBarBubbleDelegate() { 51 TestToolbarActionsBarBubbleDelegate::~TestToolbarActionsBarBubbleDelegate() {
52 // If the bubble didn't close, it means that it still owns the DelegateImpl, 52 // If the bubble didn't close, it means that it still owns the DelegateImpl,
53 // which has a weak ptr to this object. Make sure that this class always 53 // which has a weak ptr to this object. Make sure that this class always
54 // outlives the bubble. 54 // outlives the bubble.
55 CHECK(close_action_); 55 CHECK(close_action_);
56 } 56 }
57 57
58 scoped_ptr<ToolbarActionsBarBubbleDelegate> 58 std::unique_ptr<ToolbarActionsBarBubbleDelegate>
59 TestToolbarActionsBarBubbleDelegate::GetDelegate() { 59 TestToolbarActionsBarBubbleDelegate::GetDelegate() {
60 return scoped_ptr<ToolbarActionsBarBubbleDelegate>(new DelegateImpl(this)); 60 return std::unique_ptr<ToolbarActionsBarBubbleDelegate>(
61 new DelegateImpl(this));
61 } 62 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h ('k') | chrome/browser/ui/toolbar/toolbar_actions_bar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698