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

Side by Side Diff: ios/chrome/browser/ui/side_swipe/side_swipe_controller.mm

Issue 2774603002: Removes the IsReadingListEnabled flags (Closed)
Patch Set: fix tests Created 3 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 | « ios/chrome/browser/ui/side_swipe/BUILD.gn ('k') | ios/chrome/browser/ui/toolbar/BUILD.gn » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/side_swipe/side_swipe_controller.h" 5 #import "ios/chrome/browser/ui/side_swipe/side_swipe_controller.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #import "base/ios/weak_nsobject.h" 9 #import "base/ios/weak_nsobject.h"
10 #include "components/reading_list/core/reading_list_model.h" 10 #include "components/reading_list/core/reading_list_model.h"
11 #include "components/reading_list/core/reading_list_switches.h"
12 #import "ios/chrome/browser/browser_state/chrome_browser_state.h" 11 #import "ios/chrome/browser/browser_state/chrome_browser_state.h"
13 #import "ios/chrome/browser/infobars/infobar_container_view.h" 12 #import "ios/chrome/browser/infobars/infobar_container_view.h"
14 #import "ios/chrome/browser/reading_list/reading_list_model_factory.h" 13 #import "ios/chrome/browser/reading_list/reading_list_model_factory.h"
15 #import "ios/chrome/browser/snapshots/snapshot_cache.h" 14 #import "ios/chrome/browser/snapshots/snapshot_cache.h"
16 #import "ios/chrome/browser/tabs/tab.h" 15 #import "ios/chrome/browser/tabs/tab.h"
17 #import "ios/chrome/browser/tabs/tab_model_observer.h" 16 #import "ios/chrome/browser/tabs/tab_model_observer.h"
18 #import "ios/chrome/browser/ui/reading_list/reading_list_side_swipe_provider.h" 17 #import "ios/chrome/browser/ui/reading_list/reading_list_side_swipe_provider.h"
19 #import "ios/chrome/browser/ui/side_swipe/card_side_swipe_view.h" 18 #import "ios/chrome/browser/ui/side_swipe/card_side_swipe_view.h"
20 #import "ios/chrome/browser/ui/side_swipe/history_side_swipe_provider.h" 19 #import "ios/chrome/browser/ui/side_swipe/history_side_swipe_provider.h"
21 #import "ios/chrome/browser/ui/side_swipe/side_swipe_navigation_view.h" 20 #import "ios/chrome/browser/ui/side_swipe/side_swipe_navigation_view.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 - (id)initWithTabModel:(TabModel*)model 115 - (id)initWithTabModel:(TabModel*)model
117 browserState:(ios::ChromeBrowserState*)browserState { 116 browserState:(ios::ChromeBrowserState*)browserState {
118 DCHECK(model); 117 DCHECK(model);
119 self = [super init]; 118 self = [super init];
120 if (self) { 119 if (self) {
121 model_.reset(model); 120 model_.reset(model);
122 [model_ addObserver:self]; 121 [model_ addObserver:self];
123 historySideSwipeProvider_.reset( 122 historySideSwipeProvider_.reset(
124 [[HistorySideSwipeProvider alloc] initWithTabModel:model_]); 123 [[HistorySideSwipeProvider alloc] initWithTabModel:model_]);
125 124
126 if (reading_list::switches::IsReadingListEnabled()) { 125 readingListSideSwipeProvider_.reset([[ReadingListSideSwipeProvider alloc]
127 readingListSideSwipeProvider_.reset([[ReadingListSideSwipeProvider alloc] 126 initWithReadingList:ReadingListModelFactory::GetForBrowserState(
128 initWithReadingList:ReadingListModelFactory::GetForBrowserState( 127 browserState)]);
129 browserState)]);
130 }
131 } 128 }
132 return self; 129 return self;
133 } 130 }
134 131
135 - (void)dealloc { 132 - (void)dealloc {
136 [model_ removeObserver:self]; 133 [model_ removeObserver:self];
137 [super dealloc]; 134 [super dealloc];
138 } 135 }
139 136
140 - (void)addHorizontalGesturesToView:(UIView*)view { 137 - (void)addHorizontalGesturesToView:(UIView*)view {
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 didChangeActiveTab:(Tab*)newTab 532 didChangeActiveTab:(Tab*)newTab
536 previousTab:(Tab*)previousTab 533 previousTab:(Tab*)previousTab
537 atIndex:(NSUInteger)index { 534 atIndex:(NSUInteger)index {
538 // Toggling the gesture's enabled state off and on will effectively cancel 535 // Toggling the gesture's enabled state off and on will effectively cancel
539 // the gesture recognizer. 536 // the gesture recognizer.
540 [swipeGestureRecognizer_ setEnabled:NO]; 537 [swipeGestureRecognizer_ setEnabled:NO];
541 [swipeGestureRecognizer_ setEnabled:YES]; 538 [swipeGestureRecognizer_ setEnabled:YES];
542 } 539 }
543 540
544 @end 541 @end
OLDNEW
« no previous file with comments | « ios/chrome/browser/ui/side_swipe/BUILD.gn ('k') | ios/chrome/browser/ui/toolbar/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698