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

Side by Side Diff: chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm

Issue 657333002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #import "chrome/browser/ui/cocoa/infobars/extension_infobar_controller.h" 5 #import "chrome/browser/ui/cocoa/infobars/extension_infobar_controller.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "chrome/browser/extensions/extension_infobar_delegate.h" 9 #include "chrome/browser/extensions/extension_infobar_delegate.h"
10 #include "chrome/browser/extensions/extension_view.h" 10 #include "chrome/browser/extensions/extension_view.h"
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 255
256 [menu removeAllItems]; 256 [menu removeAllItems];
257 [contextMenuController_ populateMenu:menu]; 257 [contextMenuController_ populateMenu:menu];
258 } 258 }
259 259
260 @end 260 @end
261 261
262 // static 262 // static
263 scoped_ptr<infobars::InfoBar> ExtensionInfoBarDelegate::CreateInfoBar( 263 scoped_ptr<infobars::InfoBar> ExtensionInfoBarDelegate::CreateInfoBar(
264 scoped_ptr<ExtensionInfoBarDelegate> delegate) { 264 scoped_ptr<ExtensionInfoBarDelegate> delegate) {
265 scoped_ptr<InfoBarCocoa> infobar( 265 scoped_ptr<InfoBarCocoa> infobar(new InfoBarCocoa(delegate.Pass()));
266 new InfoBarCocoa(delegate.PassAs<infobars::InfoBarDelegate>()));
267 base::scoped_nsobject<ExtensionInfoBarController> controller( 266 base::scoped_nsobject<ExtensionInfoBarController> controller(
268 [[ExtensionInfoBarController alloc] initWithInfoBar:infobar.get()]); 267 [[ExtensionInfoBarController alloc] initWithInfoBar:infobar.get()]);
269 infobar->set_controller(controller); 268 infobar->set_controller(controller);
270 return infobar.PassAs<infobars::InfoBar>(); 269 return infobar.Pass();
271 } 270 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698