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

Unified Diff: ios/chrome/browser/web/auto_reload_bridge.mm

Issue 2823953004: [ObjC ARC] Converts ios/chrome/browser/web:web_internal to ARC. (Closed)
Patch Set: Address comments 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
« no previous file with comments | « ios/chrome/browser/web/BUILD.gn ('k') | ios/chrome/browser/web/auto_reload_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/web/auto_reload_bridge.mm
diff --git a/ios/chrome/browser/web/auto_reload_bridge.mm b/ios/chrome/browser/web/auto_reload_bridge.mm
index 1d968f2b686d03ce16d1f3e144364922d1423a23..e8a48cf442f7f9afb73bc5884b205edc653bfd2e 100644
--- a/ios/chrome/browser/web/auto_reload_bridge.mm
+++ b/ios/chrome/browser/web/auto_reload_bridge.mm
@@ -6,19 +6,21 @@
#include <memory>
-#include "base/ios/weak_nsobject.h"
-#include "base/mac/scoped_nsobject.h"
#import "ios/chrome/browser/tabs/tab.h"
#import "ios/web/public/navigation_manager.h"
#include "net/base/network_change_notifier.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
namespace {
class NetworkChangeObserverBridge;
} // namespace
@interface AutoReloadBridge () {
- base::WeakNSObject<Tab> _tab;
- base::scoped_nsobject<AutoReloadController> _controller;
+ __weak Tab* _tab;
+ AutoReloadController* _controller;
std::unique_ptr<NetworkChangeObserverBridge> _networkBridge;
}
@@ -44,7 +46,7 @@ class NetworkChangeObserverBridge
}
private:
- AutoReloadBridge* bridge_;
+ __weak AutoReloadBridge* bridge_;
};
} // namespace
@@ -55,9 +57,9 @@ class NetworkChangeObserverBridge
DCHECK(tab);
if ((self = [super init])) {
BOOL online = !net::NetworkChangeNotifier::IsOffline();
- _tab.reset(tab);
- _controller.reset([[AutoReloadController alloc] initWithDelegate:self
- onlineStatus:online]);
+ _tab = tab;
+ _controller = [[AutoReloadController alloc] initWithDelegate:self
+ onlineStatus:online];
_networkBridge.reset(new NetworkChangeObserverBridge(self));
}
return self;
« no previous file with comments | « ios/chrome/browser/web/BUILD.gn ('k') | ios/chrome/browser/web/auto_reload_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698