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

Unified Diff: chrome/browser/ui/cocoa/browser_window_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/browser_window_controller.h
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.h b/chrome/browser/ui/cocoa/browser_window_controller.h
index de88ac1cee2949b3e33637b5718478bd78c953d7..a61a2e8cde160c63ba7455c7b04d5f212473c474 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.h
+++ b/chrome/browser/ui/cocoa/browser_window_controller.h
@@ -12,8 +12,9 @@
#import <Cocoa/Cocoa.h>
+#include <memory>
+
#include "base/mac/scoped_nsobject.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/extensions/browser_extension_window_controller.h"
#include "chrome/browser/translate/chrome_translate_client.h"
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
@@ -71,9 +72,9 @@ class Command;
// which they are destroyed. |browser_| needs to be destroyed last as most of
// the other objects hold weak references to it or things it owns
// (tab/toolbar/bookmark models, profiles, etc).
- scoped_ptr<Browser> browser_;
+ std::unique_ptr<Browser> browser_;
NSWindow* savedRegularWindow_;
- scoped_ptr<BrowserWindowCocoa> windowShim_;
+ std::unique_ptr<BrowserWindowCocoa> windowShim_;
base::scoped_nsobject<ToolbarController> toolbarController_;
base::scoped_nsobject<TabStripController> tabStripController_;
base::scoped_nsobject<FindBarCocoaController> findBarCocoaController_;
@@ -84,7 +85,7 @@ class Command;
base::scoped_nsobject<OverlayableContentsController>
overlayableContentsController_;
base::scoped_nsobject<PresentationModeController> presentationModeController_;
- scoped_ptr<ExclusiveAccessController> exclusiveAccessController_;
+ std::unique_ptr<ExclusiveAccessController> exclusiveAccessController_;
base::scoped_nsobject<BrowserWindowFullscreenTransition>
fullscreenTransition_;
@@ -94,7 +95,7 @@ class Command;
// be shut down before our destructors are called.
StatusBubbleMac* statusBubble_;
- scoped_ptr<BookmarkBubbleObserverCocoa> bookmarkBubbleObserver_;
+ std::unique_ptr<BookmarkBubbleObserverCocoa> bookmarkBubbleObserver_;
BookmarkBubbleController* bookmarkBubbleController_; // Weak.
BOOL initializing_; // YES while we are currently in initWithBrowser:
BOOL ownsBrowser_; // Only ever NO when testing
@@ -195,7 +196,8 @@ class Command;
// The Extension Command Registry used to determine which keyboard events to
// handle.
- scoped_ptr<ExtensionKeybindingRegistryCocoa> extension_keybinding_registry_;
+ std::unique_ptr<ExtensionKeybindingRegistryCocoa>
+ extension_keybinding_registry_;
}
// A convenience class method which gets the |BrowserWindowController| for a
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm ('k') | chrome/browser/ui/cocoa/browser_window_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698