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

Side by Side Diff: ios/clean/chrome/browser/ui/toolbar/toolbar_mediator.mm

Issue 2908623004: [ios clean] Toolbar displays total number of tabs. (Closed)
Patch Set: Minor comment changes. Created 3 years, 7 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 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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/clean/chrome/browser/ui/toolbar/toolbar_mediator.h" 5 #import "ios/clean/chrome/browser/ui/toolbar/toolbar_mediator.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "base/scoped_observer.h"
8 #include "base/strings/sys_string_conversions.h" 9 #include "base/strings/sys_string_conversions.h"
10 #import "ios/chrome/browser/web_state_list/web_state_list.h"
11 #import "ios/chrome/browser/web_state_list/web_state_list_observer_bridge.h"
9 #import "ios/clean/chrome/browser/ui/toolbar/toolbar_consumer.h" 12 #import "ios/clean/chrome/browser/ui/toolbar/toolbar_consumer.h"
10 #import "ios/web/public/navigation_manager.h" 13 #import "ios/web/public/navigation_manager.h"
11 #include "ios/web/public/web_state/web_state.h" 14 #include "ios/web/public/web_state/web_state.h"
12 #import "ios/web/public/web_state/web_state_observer_bridge.h" 15 #import "ios/web/public/web_state/web_state_observer_bridge.h"
13 16
14 #if !defined(__has_feature) || !__has_feature(objc_arc) 17 #if !defined(__has_feature) || !__has_feature(objc_arc)
15 #error "This file requires ARC support." 18 #error "This file requires ARC support."
16 #endif 19 #endif
17 20
18 @interface ToolbarMediator ()<CRWWebStateObserver> 21 @interface ToolbarMediator ()<CRWWebStateObserver, WebStateListObserving>
19 @end 22 @end
20 23
21 @implementation ToolbarMediator { 24 @implementation ToolbarMediator {
22 std::unique_ptr<web::WebStateObserverBridge> _webStateObserver; 25 std::unique_ptr<web::WebStateObserverBridge> _webStateObserver;
26 std::unique_ptr<WebStateListObserverBridge> _webStateListObserver;
27 std::unique_ptr<ScopedObserver<WebStateList, WebStateListObserverBridge>>
28 _scopedWebStateListObserver;
23 } 29 }
24 30
25 @synthesize consumer = _consumer; 31 @synthesize consumer = _consumer;
26 @synthesize webState = _webState; 32 @synthesize webState = _webState;
33 @synthesize webStateList = _webStateList;
27 34
28 - (void)dealloc { 35 - (void)dealloc {
36 [self disconnect];
37 }
38
39 #pragma mark - Public
40
41 - (void)disconnect {
42 self.webStateList = nullptr;
29 _webStateObserver.reset(); 43 _webStateObserver.reset();
30 _webState = nullptr;
31 } 44 }
32 45
33 #pragma mark - CRWWebStateObserver 46 #pragma mark - CRWWebStateObserver
34 47
35 - (void)webState:(web::WebState*)webState didLoadPageWithSuccess:(BOOL)success { 48 - (void)webState:(web::WebState*)webState didLoadPageWithSuccess:(BOOL)success {
36 [self.consumer 49 [self.consumer
37 setCanGoBack:self.webState->GetNavigationManager()->CanGoBack()]; 50 setCanGoBack:self.webState->GetNavigationManager()->CanGoBack()];
38 [self.consumer 51 [self.consumer
39 setCanGoForward:self.webState->GetNavigationManager()->CanGoForward()]; 52 setCanGoForward:self.webState->GetNavigationManager()->CanGoForward()];
40 } 53 }
41 54
42 - (void)webStateDidStartLoading:(web::WebState*)webState { 55 - (void)webStateDidStartLoading:(web::WebState*)webState {
43 [self.consumer setIsLoading:self.webState->IsLoading()]; 56 [self.consumer setIsLoading:self.webState->IsLoading()];
44 } 57 }
45 58
46 - (void)webStateDidStopLoading:(web::WebState*)webState { 59 - (void)webStateDidStopLoading:(web::WebState*)webState {
47 [self.consumer setIsLoading:self.webState->IsLoading()]; 60 [self.consumer setIsLoading:self.webState->IsLoading()];
48 } 61 }
49 62
50 - (void)webState:(web::WebState*)webState 63 - (void)webState:(web::WebState*)webState
51 didChangeLoadingProgress:(double)progress { 64 didChangeLoadingProgress:(double)progress {
52 [self.consumer setLoadingProgress:progress]; 65 [self.consumer setLoadingProgress:progress];
53 } 66 }
54 67
68 #pragma mark - WebStateListObserver
69
70 - (void)webStateList:(WebStateList*)webStateList
71 didInsertWebState:(web::WebState*)webState
72 atIndex:(int)index {
73 [self.consumer setNumberOfTabs:_webStateList->count()];
74 }
75
76 - (void)webStateList:(WebStateList*)webStateList
77 didDetachWebState:(web::WebState*)webState
78 atIndex:(int)index {
79 [self.consumer setNumberOfTabs:_webStateList->count()];
80 }
81
55 #pragma mark - Setters 82 #pragma mark - Setters
56 83
57 - (void)setWebState:(web::WebState*)webState { 84 - (void)setWebState:(web::WebState*)webState {
58 _webState = webState; 85 _webState = webState;
59 _webStateObserver = 86 _webStateObserver =
60 base::MakeUnique<web::WebStateObserverBridge>(_webState, self); 87 base::MakeUnique<web::WebStateObserverBridge>(_webState, self);
61 if (self.consumer) { 88 if (self.consumer) {
62 [self updateConsumer]; 89 [self updateConsumer];
63 } 90 }
64 } 91 }
65 92
66 - (void)setConsumer:(id<ToolbarConsumer>)consumer { 93 - (void)setConsumer:(id<ToolbarConsumer>)consumer {
67 _consumer = consumer; 94 _consumer = consumer;
68 if (self.webState) { 95 if (self.webState) {
69 [self updateConsumer]; 96 [self updateConsumer];
70 } 97 }
98 if (self.webStateList) {
99 [self.consumer setNumberOfTabs:_webStateList->count()];
100 }
101 }
102
103 - (void)setWebStateList:(WebStateList*)webStateList {
104 _webStateList = webStateList;
105 _webStateListObserver = base::MakeUnique<WebStateListObserverBridge>(self);
106 _scopedWebStateListObserver = base::MakeUnique<
107 ScopedObserver<WebStateList, WebStateListObserverBridge>>(
108 _webStateListObserver.get());
109 if (_webStateList) {
110 _scopedWebStateListObserver->Add(_webStateList);
111 if (self.consumer) {
112 [self.consumer setNumberOfTabs:_webStateList->count()];
edchin 2017/05/27 16:25:06 If the webStateList is set to nil, wouldn't you wa
marq (ping after 24h) 2017/05/29 11:04:36 Yes, I think it's correct to declare that setting
sczs 2017/05/30 00:18:21 The main problem is that we are explicitly calling
113 }
114 }
71 } 115 }
72 116
73 #pragma mark - Helper methods 117 #pragma mark - Helper methods
74 118
75 // Updates the consumer to match the current WebState. 119 // Updates the consumer to match the current WebState.
76 - (void)updateConsumer { 120 - (void)updateConsumer {
77 DCHECK(self.webState); 121 DCHECK(self.webState);
78 DCHECK(self.consumer); 122 DCHECK(self.consumer);
79 [self.consumer 123 [self.consumer
80 setCanGoForward:self.webState->GetNavigationManager()->CanGoForward()]; 124 setCanGoForward:self.webState->GetNavigationManager()->CanGoForward()];
81 [self.consumer 125 [self.consumer
82 setCanGoBack:self.webState->GetNavigationManager()->CanGoBack()]; 126 setCanGoBack:self.webState->GetNavigationManager()->CanGoBack()];
83 [self.consumer setIsLoading:self.webState->IsLoading()]; 127 [self.consumer setIsLoading:self.webState->IsLoading()];
84 } 128 }
85 129
86 @end 130 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698