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

Unified Diff: ios/clean/chrome/browser/ui/web_contents/web_contents_mediator.mm

Issue 2780423003: [ios] Use web_state_list in web_contents_mediator. (Closed)
Patch Set: Rebase. 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/clean/chrome/browser/ui/web_contents/web_contents_mediator.mm
diff --git a/ios/clean/chrome/browser/ui/web_contents/web_contents_mediator.mm b/ios/clean/chrome/browser/ui/web_contents/web_contents_mediator.mm
index 2a5529bc5f8dd067bc843f649c472665d58b8d77..9c2bc7fbd432a92da3a0dc1523b891eb67b19e6c 100644
--- a/ios/clean/chrome/browser/ui/web_contents/web_contents_mediator.mm
+++ b/ios/clean/chrome/browser/ui/web_contents/web_contents_mediator.mm
@@ -4,7 +4,10 @@
#import "ios/clean/chrome/browser/ui/web_contents/web_contents_mediator.h"
+#include "base/memory/ptr_util.h"
#import "ios/clean/chrome/browser/ui/web_contents/web_contents_consumer.h"
+#import "ios/shared/chrome/browser/tabs/web_state_list.h"
+#import "ios/shared/chrome/browser/tabs/web_state_list_observer_bridge.h"
#import "ios/web/public/navigation_manager.h"
#include "ios/web/public/web_state/web_state.h"
#include "ui/base/page_transition_types.h"
@@ -14,32 +17,96 @@
#error "This file requires ARC support."
#endif
-@implementation WebContentsMediator
-@synthesize webState = _webState;
+@interface WebContentsMediator ()<WebStateListObserving>
+@end
+
+@implementation WebContentsMediator {
+ std::unique_ptr<WebStateListObserverBridge> _webStateListObserver;
+}
+@synthesize webStateList = _webStateList;
@synthesize consumer = _consumer;
-- (void)setWebState:(web::WebState*)webState {
- if (_webState)
- _webState->SetWebUsageEnabled(false);
+- (void)dealloc {
+ [self disconnect];
+}
+
+#pragma mark - Public
- _webState = webState;
- if (!self.webState)
+- (void)disconnect {
+ if (!self.webStateList) {
return;
+ }
+ [self disableWebUsage:self.webStateList->GetActiveWebState()];
+ self.webStateList = nullptr;
+}
- self.webState->SetWebUsageEnabled(true);
- if (!self.webState->GetNavigationManager()->GetItemCount()) {
- web::NavigationManager::WebLoadParams params(
- GURL("https://dev.chromium.org/"));
- params.transition_type = ui::PAGE_TRANSITION_TYPED;
- self.webState->GetNavigationManager()->LoadURLWithParams(params);
+#pragma mark - Properties
+
+- (void)setWebStateList:(WebStateList*)webStateList {
+ if (_webStateList) {
+ _webStateList->RemoveObserver(_webStateListObserver.get());
+ _webStateListObserver.reset();
+ }
+ _webStateList = webStateList;
+ if (!_webStateList) {
+ return;
+ }
+ _webStateListObserver = base::MakeUnique<WebStateListObserverBridge>(self);
+ _webStateList->AddObserver(_webStateListObserver.get());
+ if (_webStateList->GetActiveWebState()) {
+ [self updateConsumerWithWebState:_webStateList->GetActiveWebState()];
}
- [self.consumer contentViewDidChange:self.webState->GetView()];
}
- (void)setConsumer:(id<WebContentsConsumer>)consumer {
_consumer = consumer;
- if (self.webState)
- [self.consumer contentViewDidChange:self.webState->GetView()];
+ if (self.webStateList && self.webStateList->GetActiveWebState()) {
+ [self updateConsumerWithWebState:self.webStateList->GetActiveWebState()];
+ }
+}
+
+#pragma mark - WebStateListObserving
+
+- (void)webStateList:(WebStateList*)webStateList
+ didChangeActiveWebState:(web::WebState*)newWebState
+ oldWebState:(web::WebState*)oldWebState
+ atIndex:(int)atIndex
+ userAction:(BOOL)userAction {
+ [self disableWebUsage:oldWebState];
+ [self updateConsumerWithWebState:newWebState];
+}
+
+#pragma mark - Private
+
+- (void)disableWebUsage:(web::WebState*)webState {
+ if (webState) {
+ webState->SetWebUsageEnabled(false);
+ }
+}
+
+// Sets |webState| webUsageEnabled and updates the consumer's contentView.
+- (void)updateConsumerWithWebState:(web::WebState*)webState {
+ UIView* updatedView = nil;
+ if (webState) {
+ webState->SetWebUsageEnabled(true);
+ updatedView = webState->GetView();
+ // PLACEHOLDER: This navigates the page since the omnibox is not yet
+ // hooked up.
+ [self navigateToDefaultPage:webState];
+ }
+ if (self.consumer) {
+ [self.consumer contentViewDidChange:updatedView];
+ }
+}
+
+// PLACEHOLDER: This navigates the page since the omnibox is not yet hooked up.
+- (void)navigateToDefaultPage:(web::WebState*)webState {
+ if (!webState->GetNavigationManager()->GetItemCount()) {
+ web::NavigationManager::WebLoadParams params(
+ GURL("https://dev.chromium.org/"));
+ params.transition_type = ui::PAGE_TRANSITION_TYPED;
+ webState->GetNavigationManager()->LoadURLWithParams(params);
+ }
}
@end

Powered by Google App Engine
This is Rietveld 408576698