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

Unified Diff: chrome/browser/ui/cocoa/extensions/extension_popup_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/extensions/extension_popup_controller.h
diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.h b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.h
index 07652262c6ffcb428da3402d3ccf2a8e71731a23..05763382724cdfba445159283fd46edcb672bddb 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.h
+++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.h
@@ -6,9 +6,10 @@
#define CHROME_BROWSER_UI_COCOA_EXTENSIONS_EXTENSION_POPUP_CONTROLLER_H_
#import <Cocoa/Cocoa.h>
+
+#include <memory>
#include <string>
-#include "base/memory/scoped_ptr.h"
#import "chrome/browser/ui/cocoa/base_bubble_controller.h"
#import "chrome/browser/ui/cocoa/info_bubble_view.h"
#include "content/public/browser/notification_registrar.h"
@@ -38,11 +39,11 @@ class ExtensionViewHost;
NSRect extensionFrame_;
// The extension host object.
- scoped_ptr<extensions::ExtensionViewHost> host_;
+ std::unique_ptr<extensions::ExtensionViewHost> host_;
content::NotificationRegistrar registrar_;
- scoped_ptr<ExtensionPopupNotificationBridge> notificationBridge_;
- scoped_ptr<ExtensionPopupContainer> container_;
+ std::unique_ptr<ExtensionPopupNotificationBridge> notificationBridge_;
+ std::unique_ptr<ExtensionPopupContainer> container_;
std::string extensionId_;
@@ -68,13 +69,12 @@ class ExtensionViewHost;
// Passing YES to |devMode| will launch the webkit inspector for the popup,
// and prevent the popup from closing when focus is lost. It will be closed
// after the inspector is closed, or another popup is opened.
-+ (ExtensionPopupController*)host:(scoped_ptr<extensions::ExtensionViewHost>)
- host
- inBrowser:(Browser*)browser
- anchoredAt:(NSPoint)anchoredAt
- arrowLocation:(info_bubble::BubbleArrowLocation)
- arrowLocation
- devMode:(BOOL)devMode;
++ (ExtensionPopupController*)
+ host:(std::unique_ptr<extensions::ExtensionViewHost>)host
+ inBrowser:(Browser*)browser
+ anchoredAt:(NSPoint)anchoredAt
+arrowLocation:(info_bubble::BubbleArrowLocation)arrowLocation
+ devMode:(BOOL)devMode;
// Returns the controller used to display the popup being shown. If no popup is
// currently open, then nil is returned. Static because only one extension popup

Powered by Google App Engine
This is Rietveld 408576698