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

Side by Side Diff: ios/web/crw_network_activity_indicator_manager.mm

Issue 1023013002: Minor cleanup in ios/web utils (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « no previous file | ios/web/history_state_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ios/web/crw_network_activity_indicator_manager.h" 5 #import "ios/web/crw_network_activity_indicator_manager.h"
6 6
7 #import <UIKit/UIKit.h> 7 #import <UIKit/UIKit.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/mac/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
11 #include "base/threading/thread_checker.h" 11 #include "base/threading/thread_checker.h"
12 12
13 @interface CRWNetworkActivityIndicatorManager () { 13 @interface CRWNetworkActivityIndicatorManager () {
14 base::scoped_nsobject<NSMutableDictionary> _groupCounts; 14 base::scoped_nsobject<NSMutableDictionary> _groupCounts;
15 NSUInteger _totalCount; 15 NSUInteger _totalCount;
16 base::ThreadChecker _threadChecker; 16 base::ThreadChecker _threadChecker;
17 } 17 }
18 18
19 @end 19 @end
20 20
21 @implementation CRWNetworkActivityIndicatorManager 21 @implementation CRWNetworkActivityIndicatorManager
22 22
23 + (CRWNetworkActivityIndicatorManager*)sharedInstance { 23 + (CRWNetworkActivityIndicatorManager*)sharedInstance {
24 static CRWNetworkActivityIndicatorManager* instance = 24 static CRWNetworkActivityIndicatorManager* instance =
25 [[CRWNetworkActivityIndicatorManager alloc] init]; 25 [[CRWNetworkActivityIndicatorManager alloc] init];
26 return instance; 26 return instance;
27 } 27 }
28 28
29 - (id)init { 29 - (instancetype)init {
30 self = [super init]; 30 self = [super init];
31 if (self) { 31 if (self) {
32 _groupCounts.reset([[NSMutableDictionary alloc] init]); 32 _groupCounts.reset([[NSMutableDictionary alloc] init]);
33 _totalCount = 0; 33 _totalCount = 0;
34 } 34 }
35 return self; 35 return self;
36 } 36 }
37 37
38 - (void)startNetworkTaskForGroup:(NSString*)group { 38 - (void)startNetworkTaskForGroup:(NSString*)group {
39 [self startNetworkTasks:1 forGroup:group]; 39 [self startNetworkTasks:1 forGroup:group];
40 } 40 }
41 41
42 - (void)stopNetworkTaskForGroup:(NSString*)group { 42 - (void)stopNetworkTaskForGroup:(NSString*)group {
43 [self stopNetworkTasks:1 forGroup:group]; 43 [self stopNetworkTasks:1 forGroup:group];
44 } 44 }
45 45
46 - (void)startNetworkTasks:(NSUInteger)numTasks forGroup:(NSString*)group { 46 - (void)startNetworkTasks:(NSUInteger)numTasks forGroup:(NSString*)group {
47 DCHECK(_threadChecker.CalledOnValidThread()); 47 DCHECK(_threadChecker.CalledOnValidThread());
48 DCHECK(group); 48 DCHECK(group);
49 DCHECK_GT(numTasks, 0U); 49 DCHECK_GT(numTasks, 0U);
50 NSUInteger count = 0; 50 NSUInteger count = 0;
51 NSNumber* number = [_groupCounts objectForKey:group]; 51 NSNumber* number = [_groupCounts objectForKey:group];
52 if (number) { 52 if (number) {
53 count = [number unsignedIntegerValue]; 53 count = [number unsignedIntegerValue];
54 DCHECK_GT(count, 0U); 54 DCHECK_GT(count, 0U);
55 } 55 }
56 count += numTasks; 56 count += numTasks;
57 [_groupCounts setObject:[NSNumber numberWithUnsignedInteger:count] 57 [_groupCounts setObject:@(count)
Eugene But (OOO till 7-30) 2015/03/20 16:10:24 Please run "git cl format"
stuartmorgan 2015/03/20 16:24:56 Done.
58 forKey:group]; 58 forKey:group];
59 _totalCount += numTasks; 59 _totalCount += numTasks;
60 if (_totalCount == numTasks) { 60 if (_totalCount == numTasks) {
61 [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES]; 61 [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
62 } 62 }
63 } 63 }
64 64
65 - (void)stopNetworkTasks:(NSUInteger)numTasks forGroup:(NSString*)group { 65 - (void)stopNetworkTasks:(NSUInteger)numTasks forGroup:(NSString*)group {
66 DCHECK(_threadChecker.CalledOnValidThread()); 66 DCHECK(_threadChecker.CalledOnValidThread());
67 DCHECK(group); 67 DCHECK(group);
68 DCHECK_GT(numTasks, 0U); 68 DCHECK_GT(numTasks, 0U);
69 NSNumber* number = [_groupCounts objectForKey:group]; 69 NSNumber* number = [_groupCounts objectForKey:group];
70 DCHECK(number); 70 DCHECK(number);
71 NSUInteger count = [number unsignedIntegerValue]; 71 NSUInteger count = [number unsignedIntegerValue];
72 DCHECK(count >= numTasks); 72 DCHECK(count >= numTasks);
73 count -= numTasks; 73 count -= numTasks;
74 if (count == 0) { 74 if (count == 0) {
75 [_groupCounts removeObjectForKey:group]; 75 [_groupCounts removeObjectForKey:group];
76 } else { 76 } else {
77 [_groupCounts setObject:[NSNumber numberWithUnsignedInteger:count] 77 [_groupCounts setObject:@(count)
78 forKey:group]; 78 forKey:group];
79 } 79 }
80 _totalCount -= numTasks; 80 _totalCount -= numTasks;
81 if (_totalCount == 0) { 81 if (_totalCount == 0) {
82 [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO]; 82 [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
83 } 83 }
84 } 84 }
85 85
86 - (NSUInteger)clearNetworkTasksForGroup:(NSString*)group { 86 - (NSUInteger)clearNetworkTasksForGroup:(NSString*)group {
87 DCHECK(_threadChecker.CalledOnValidThread()); 87 DCHECK(_threadChecker.CalledOnValidThread());
(...skipping 16 matching lines...) Expand all
104 return 0; 104 return 0;
105 } 105 }
106 return [number unsignedIntegerValue]; 106 return [number unsignedIntegerValue];
107 } 107 }
108 108
109 - (NSUInteger)numTotalNetworkTasks { 109 - (NSUInteger)numTotalNetworkTasks {
110 DCHECK(_threadChecker.CalledOnValidThread()); 110 DCHECK(_threadChecker.CalledOnValidThread());
111 return _totalCount; 111 return _totalCount;
112 } 112 }
113 113
114
115 @end 114 @end
OLDNEW
« no previous file with comments | « no previous file | ios/web/history_state_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698