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

Unified Diff: chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

Issue 18346006: Update OS X to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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/browser_actions_controller.mm
diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
index 4f05f5a6af05123a6c9320de5fc712619f90e9e4..e551c4bbd6e72ed5d0973f380607c0dddb6131b5 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
@@ -487,10 +487,10 @@ class ExtensionServiceObserverBridge : public content::NotificationObserver,
for (ExtensionList::const_iterator iter =
toolbarModel_->toolbar_items().begin();
iter != toolbarModel_->toolbar_items().end(); ++iter) {
- if (![self shouldDisplayBrowserAction:*iter])
+ if (![self shouldDisplayBrowserAction:iter->get()])
continue;
- [self createActionButtonForExtension:*iter withIndex:i++];
+ [self createActionButtonForExtension:iter->get() withIndex:i++];
}
CGFloat width = [self savedWidth];
@@ -579,9 +579,9 @@ class ExtensionServiceObserverBridge : public content::NotificationObserver,
for (ExtensionList::const_iterator iter =
toolbarModel_->toolbar_items().begin();
iter != toolbarModel_->toolbar_items().end(); ++iter) {
- if (![self shouldDisplayBrowserAction:*iter])
+ if (![self shouldDisplayBrowserAction:iter->get()])
continue;
- BrowserActionButton* button = [self buttonForExtension:(*iter)];
+ BrowserActionButton* button = [self buttonForExtension:(iter->get())];
if (!button)
continue;
if (![button isBeingDragged])
@@ -672,7 +672,7 @@ class ExtensionServiceObserverBridge : public content::NotificationObserver,
for (ExtensionList::const_iterator iter =
toolbarModel_->toolbar_items().begin();
iter != toolbarModel_->toolbar_items().end(); ++iter) {
- BrowserActionButton* button = [self buttonForExtension:(*iter)];
+ BrowserActionButton* button = [self buttonForExtension:(iter->get())];
NSRect buttonFrame = [button frame];
if (NSContainsRect([containerView_ bounds], buttonFrame))
continue;
@@ -712,7 +712,7 @@ class ExtensionServiceObserverBridge : public content::NotificationObserver,
for (ExtensionList::const_iterator iter =
toolbarModel_->toolbar_items().begin();
iter != toolbarModel_->toolbar_items().end(); ++iter) {
- BrowserActionButton* button = [self buttonForExtension:(*iter)];
+ BrowserActionButton* button = [self buttonForExtension:(iter->get())];
CGFloat intersectionWidth =
NSWidth(NSIntersectionRect(draggedButtonFrame, [button frame]));
@@ -878,7 +878,7 @@ class ExtensionServiceObserverBridge : public content::NotificationObserver,
const extensions::ExtensionList& toolbar_items =
toolbarModel_->toolbar_items();
if (index < toolbar_items.size()) {
- const Extension* extension = toolbar_items[index];
+ const Extension* extension = toolbar_items[index].get();
return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())];
}
return nil;

Powered by Google App Engine
This is Rietveld 408576698