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

Unified Diff: chrome/installer/mac/app/OmahaCommunication.m

Issue 2148293005: Migrate mac installer to delegate-driven model (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Last patch before CQ Created 4 years, 5 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 | « chrome/installer/mac/app/OmahaCommunication.h ('k') | chrome/installer/mac/app/OmahaXMLRequest.m » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/mac/app/OmahaCommunication.m
diff --git a/chrome/installer/mac/app/OmahaCommunication.m b/chrome/installer/mac/app/OmahaCommunication.m
index 42328902309983d7d8b1aaeecf40676a7f870806..8368ff72208fbcbfacbc03045943ccc02b81578f 100644
--- a/chrome/installer/mac/app/OmahaCommunication.m
+++ b/chrome/installer/mac/app/OmahaCommunication.m
@@ -2,22 +2,23 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#import <Foundation/Foundation.h>
+#import "OmahaCommunication.h"
-#include "OmahaCommunication.h"
+#import "OmahaXMLRequest.h"
-@implementation OmahaCommunication : NSObject
+@implementation OmahaCommunication
@synthesize requestXMLBody = requestXMLBody_;
@synthesize sessionHelper = sessionHelper_;
+@synthesize delegate = delegate_;
- (id)init {
- return [self initWithBody:[[NSXMLDocument alloc] init]];
+ return [self initWithBody:[OmahaXMLRequest createXMLRequestBody]];
}
- (id)initWithBody:(NSXMLDocument*)xmlBody {
if ((self = [super init])) {
- sessionHelper_ = [[NetworkCommunication alloc] init];
+ sessionHelper_ = [[NetworkCommunication alloc] initWithDelegate:self];
requestXMLBody_ = xmlBody;
[self createOmahaRequest];
}
@@ -33,27 +34,13 @@
return request;
}
-- (void)sendRequestWithBlock:(OmahaRequestCompletionHandler)block {
- DataTaskCompletionHandler cHandler =
- ^(NSData* _Nullable data, NSURLResponse* _Nullable response,
- NSError* _Nullable error) {
- if (error) {
- NSLog(@"%@", error);
- block(data, error);
- return;
- }
-
- NSHTTPURLResponse* HTTPResponse = (NSHTTPURLResponse*)response;
- if (HTTPResponse.statusCode != 200) {
- // TODO: make these logging statements more rare
- NSLog(@"HTTP response: %ld", (unsigned long)HTTPResponse.statusCode);
- }
-
- block(data, error);
-
- };
-
- [sessionHelper_ sendDataRequestWithCompletionHandler:cHandler];
+- (void)sendRequest {
+ [sessionHelper_ setDataResponseHandler:^(NSData* _Nullable data,
+ NSURLResponse* _Nullable response,
+ NSError* _Nullable error) {
+ [delegate_ onOmahaSuccessWithResponseBody:data AndError:error];
+ }];
+ [sessionHelper_ sendDataRequest];
}
@end
« no previous file with comments | « chrome/installer/mac/app/OmahaCommunication.h ('k') | chrome/installer/mac/app/OmahaXMLRequest.m » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698