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

Side by Side Diff: ios/chrome/browser/ui/ntp/new_tab_page_controller.mm

Issue 2835033002: Revert of Replace TabModel with WebStateList in GoogleLandingController. (Closed)
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/chrome/browser/ui/ntp/new_tab_page_controller.h" 5 #import "ios/chrome/browser/ui/ntp/new_tab_page_controller.h"
6 6
7 #import <QuartzCore/QuartzCore.h> 7 #import <QuartzCore/QuartzCore.h>
8 8
9 #import "base/ios/weak_nsobject.h" 9 #import "base/ios/weak_nsobject.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 [bookmarkController_ setDelegate:self]; 536 [bookmarkController_ setDelegate:self];
537 } else if (item.identifier == NewTabPage::kMostVisitedPanel) { 537 } else if (item.identifier == NewTabPage::kMostVisitedPanel) {
538 if (!googleLandingController_) { 538 if (!googleLandingController_) {
539 googleLandingController_.reset([[GoogleLandingController alloc] init]); 539 googleLandingController_.reset([[GoogleLandingController alloc] init]);
540 googleLandingMediator_.reset([[GoogleLandingMediator alloc] 540 googleLandingMediator_.reset([[GoogleLandingMediator alloc]
541 initWithConsumer:googleLandingController_ 541 initWithConsumer:googleLandingController_
542 browserState:browserState_ 542 browserState:browserState_
543 loader:loader_ 543 loader:loader_
544 focuser:focuser_ 544 focuser:focuser_
545 webToolbarDelegate:webToolbarDelegate_ 545 webToolbarDelegate:webToolbarDelegate_
546 webStateList:[tabModel_ webStateList]]); 546 tabModel:tabModel_]);
547 [googleLandingController_ setDataSource:googleLandingMediator_]; 547 [googleLandingController_ setDataSource:googleLandingMediator_];
548 } 548 }
549 panelController = googleLandingController_; 549 panelController = googleLandingController_;
550 view = [googleLandingController_ view]; 550 view = [googleLandingController_ view];
551 [googleLandingController_ setDelegate:self]; 551 [googleLandingController_ setDelegate:self];
552 } else if (item.identifier == NewTabPage::kOpenTabsPanel) { 552 } else if (item.identifier == NewTabPage::kOpenTabsPanel) {
553 if (!openTabsController_) 553 if (!openTabsController_)
554 openTabsController_.reset([[RecentTabsPanelController alloc] 554 openTabsController_.reset([[RecentTabsPanelController alloc]
555 initWithLoader:loader_ 555 initWithLoader:loader_
556 browserState:browserState_]); 556 browserState:browserState_]);
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 731
732 - (void)updateNtpBarShadowForPanelController: 732 - (void)updateNtpBarShadowForPanelController:
733 (id<NewTabPagePanelProtocol>)ntpPanelController { 733 (id<NewTabPagePanelProtocol>)ntpPanelController {
734 if (currentController_ != ntpPanelController) 734 if (currentController_ != ntpPanelController)
735 return; 735 return;
736 [self.ntpView.tabBar 736 [self.ntpView.tabBar
737 setShadowAlpha:[ntpPanelController alphaForBottomShadow]]; 737 setShadowAlpha:[ntpPanelController alphaForBottomShadow]];
738 } 738 }
739 739
740 @end 740 @end
OLDNEW
« no previous file with comments | « ios/chrome/browser/ui/ntp/google_landing_mediator.mm ('k') | ios/chrome/browser/ui/ntp/new_tab_page_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698