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

Unified Diff: ios/chrome/browser/ui/tab_switcher/tab_switcher_button.mm

Issue 2810193002: [ObjC ARC] Converts ios/chrome/browser/ui/tab_switcher:tab_switcher to ARC. (Closed)
Patch Set: cast Created 3 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: ios/chrome/browser/ui/tab_switcher/tab_switcher_button.mm
diff --git a/ios/chrome/browser/ui/tab_switcher/tab_switcher_button.mm b/ios/chrome/browser/ui/tab_switcher/tab_switcher_button.mm
index fbb1adaf77edb0820277b5aa4526851f1874b5cf..359a4a50d41055fa2420a8a1f6c51e7c2a3f51a9 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_switcher_button.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_switcher_button.mm
@@ -4,11 +4,14 @@
#include "ios/chrome/browser/ui/tab_switcher/tab_switcher_button.h"
-#include "base/mac/scoped_nsobject.h"
#import "ios/third_party/material_components_ios/src/components/Ink/src/MaterialInk.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
@interface TabSwitcherButton () {
- base::scoped_nsobject<MDCInkTouchController> _inkTouchController;
+ MDCInkTouchController* _inkTouchController;
}
@end
@@ -17,8 +20,7 @@
- (instancetype)initWithFrame:(CGRect)frame {
self = [super initWithFrame:frame];
if (self) {
- _inkTouchController.reset(
- [[MDCInkTouchController alloc] initWithView:self]);
+ _inkTouchController = [[MDCInkTouchController alloc] initWithView:self];
[_inkTouchController addInkView];
// TODO(crbug.com/606807): Adjust the desired ink color.
[_inkTouchController defaultInkView].inkColor =

Powered by Google App Engine
This is Rietveld 408576698