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

Unified Diff: ios/chrome/browser/ui/ntp/google_landing_controller.mm

Issue 2829003002: Add CommandDispatcher to BrowserViewController. (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/chrome/browser/ui/ntp/google_landing_controller.mm
diff --git a/ios/chrome/browser/ui/ntp/google_landing_controller.mm b/ios/chrome/browser/ui/ntp/google_landing_controller.mm
index fec88c927791fbd7f0c0012658f79acf5ef8f831..25387d01954db531df95e9544b76d0312cb5ecd7 100644
--- a/ios/chrome/browser/ui/ntp/google_landing_controller.mm
+++ b/ios/chrome/browser/ui/ntp/google_landing_controller.mm
@@ -21,8 +21,10 @@
#import "ios/chrome/browser/ui/ntp/new_tab_page_header_view.h"
#import "ios/chrome/browser/ui/ntp/whats_new_header_view.h"
#import "ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.h"
+#import "ios/chrome/browser/ui/toolbar/web_toolbar_controller.h"
#include "ios/chrome/browser/ui/ui_util.h"
#import "ios/chrome/browser/ui/uikit_ui_util.h"
+#import "ios/chrome/browser/ui/url_loader.h"
#include "ios/chrome/common/string_util.h"
#include "ios/chrome/grit/ios_strings.h"
#import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
@@ -30,6 +32,7 @@
#import "ios/web/public/web_state/context_menu_params.h"
#import "net/base/mac/url_conversions.h"
#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/page_transition_types.h"
using base::UserMetricsAction;
@@ -262,6 +265,7 @@ const CGFloat kMostVisitedPaddingIPadFavicon = 24;
@synthesize dataSource = _dataSource;
// Property declared in NewTabPagePanelProtocol.
@synthesize delegate = _delegate;
+@synthesize dispatcher = _dispatcher;
@synthesize isOffTheRecord = _isOffTheRecord;
@synthesize logoIsShowing = _logoIsShowing;
@synthesize promoText = _promoText;
@@ -790,7 +794,7 @@ const CGFloat kMostVisitedPaddingIPadFavicon = 24;
if (_scrolledToTop) {
_animateHeader = NO;
if (!IsIPadIdiom()) {
- [self.dataSource onFakeboxAnimationComplete];
+ [self.dispatcher onFakeboxAnimationComplete];
[_headerView fadeOutShadow];
[_searchTapTarget setHidden:YES];
}
@@ -799,12 +803,12 @@ const CGFloat kMostVisitedPaddingIPadFavicon = 24;
}
- (void)searchFieldTapped:(id)sender {
- [self.dataSource focusFakebox];
+ [self.dispatcher focusFakebox];
}
- (void)blurOmnibox {
if (_omniboxFocused) {
- [self.dataSource cancelOmniboxEdit];
+ [self.dispatcher cancelOmniboxEdit];
} else {
[self locationBarResignsFirstResponder];
}
@@ -827,7 +831,7 @@ const CGFloat kMostVisitedPaddingIPadFavicon = 24;
_scrolledToTop = NO;
if (!IsIPadIdiom()) {
[_searchTapTarget setHidden:NO];
- [self.dataSource onFakeboxBlur];
+ [self.dispatcher onFakeboxBlur];
}
// Reload most visited sites in case the number of placeholder cells needs to
@@ -976,7 +980,7 @@ const CGFloat kMostVisitedPaddingIPadFavicon = 24;
[self blurOmnibox];
DCHECK(visitedIndex < [self numberOfItems]);
[self.dataSource logMostVisitedClick:visitedIndex tileType:cell.tileType];
- [self.dataSource loadURL:[self urlForIndex:visitedIndex]
+ [self.dispatcher loadURL:[self urlForIndex:visitedIndex]
referrer:web::Referrer()
transition:ui::PAGE_TRANSITION_AUTO_BOOKMARK
rendererInitiated:NO];
@@ -1006,7 +1010,8 @@ const CGFloat kMostVisitedPaddingIPadFavicon = 24;
if (!IsIPadIdiom()) {
// iPhone header also contains a toolbar since the normal toolbar is
// hidden.
- [_headerView addToolbarWithDataSource:self.dataSource];
+ [_headerView addToolbarWithDataSource:self.dataSource
+ dispatcher:self.dispatcher];
[_headerView setToolbarTabCount:self.tabCount];
[_headerView setCanGoForward:self.canGoForward];
[_headerView setCanGoBack:self.canGoBack];
@@ -1139,7 +1144,7 @@ const CGFloat kMostVisitedPaddingIPadFavicon = 24;
MostVisitedCell* cell = (MostVisitedCell*)sender.view;
[[strongSelf dataSource] logMostVisitedClick:index
tileType:cell.tileType];
- [[strongSelf dataSource] webPageOrderedOpen:url
+ [[strongSelf dispatcher] webPageOrderedOpen:url
referrer:web::Referrer()
inBackground:YES
appendTo:kCurrentTab];
@@ -1159,7 +1164,7 @@ const CGFloat kMostVisitedPaddingIPadFavicon = 24;
MostVisitedCell* cell = (MostVisitedCell*)sender.view;
[[strongSelf dataSource] logMostVisitedClick:index
tileType:cell.tileType];
- [[strongSelf dataSource] webPageOrderedOpen:url
+ [[strongSelf dispatcher] webPageOrderedOpen:url
referrer:web::Referrer()
inIncognito:YES
inBackground:NO
@@ -1220,7 +1225,7 @@ const CGFloat kMostVisitedPaddingIPadFavicon = 24;
}
- (void)onPromoLabelTapped {
- [self.dataSource cancelOmniboxEdit];
+ [self.dispatcher cancelOmniboxEdit];
[_promoHeaderView setHidden:YES];
[self.view setNeedsLayout];
[self.dataSource promoTapped];
@@ -1317,7 +1322,7 @@ const CGFloat kMostVisitedPaddingIPadFavicon = 24;
CGFloat pinnedOffsetY = [self pinnedOffsetY];
if (_omniboxFocused && scrollView.dragging &&
scrollView.contentOffset.y < pinnedOffsetY) {
- [self.dataSource cancelOmniboxEdit];
+ [self.dispatcher cancelOmniboxEdit];
}
if (IsIPadIdiom()) {

Powered by Google App Engine
This is Rietveld 408576698