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

Unified Diff: chrome/browser/ui/cocoa/toolbar/toolbar_controller.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/toolbar/toolbar_controller.h
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h
index 07da7ca1b4d5297b329159f86c91496356e2437f..34de04e46cff4c188aab76a3a4a8b59e52f2a67f 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h
@@ -7,8 +7,9 @@
#import <Cocoa/Cocoa.h>
+#include <memory>
+
#include "base/mac/scoped_nsobject.h"
-#include "base/memory/scoped_ptr.h"
#import "chrome/browser/ui/cocoa/has_weak_browser_pointer.h"
#import "chrome/browser/ui/cocoa/url_drop_target.h"
#import "chrome/browser/ui/cocoa/view_resizer.h"
@@ -62,21 +63,23 @@ class NotificationBridge;
CommandUpdater* commands_; // weak, one per window
Profile* profile_; // weak, one per window
Browser* browser_; // weak, one per window
- scoped_ptr<ToolbarControllerInternal::CommandObserverBridge> commandObserver_;
- scoped_ptr<LocationBarViewMac> locationBarView_;
+ std::unique_ptr<ToolbarControllerInternal::CommandObserverBridge>
+ commandObserver_;
+ std::unique_ptr<LocationBarViewMac> locationBarView_;
base::scoped_nsobject<AutocompleteTextFieldEditor>
autocompleteTextFieldEditor_;
base::scoped_nsobject<BackForwardMenuController> backMenuController_;
base::scoped_nsobject<BackForwardMenuController> forwardMenuController_;
base::scoped_nsobject<BrowserActionsController> browserActionsController_;
- scoped_ptr<BrowserActionsContainerViewSizeDelegate>
+ std::unique_ptr<BrowserActionsContainerViewSizeDelegate>
browserActionsContainerDelegate_;
// Lazily-instantiated menu controller.
base::scoped_nsobject<AppMenuController> appMenuController_;
// Used for monitoring the optional toolbar button prefs.
- scoped_ptr<ToolbarControllerInternal::NotificationBridge> notificationBridge_;
+ std::unique_ptr<ToolbarControllerInternal::NotificationBridge>
+ notificationBridge_;
BooleanPrefMember showHomeButton_;
BOOL hasToolbar_; // If NO, we may have only the location bar.
BOOL hasLocationBar_; // If |hasToolbar_| is YES, this must also be YES.

Powered by Google App Engine
This is Rietveld 408576698