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

Side by Side Diff: ios/chrome/browser/ui/activity_services/activity_service_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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/activity_services/activity_service_controller.h" 5 #import "ios/chrome/browser/ui/activity_services/activity_service_controller.h"
6 6
7 #import <MobileCoreServices/MobileCoreServices.h> 7 #import <MobileCoreServices/MobileCoreServices.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/mac/foundation_util.h" 10 #include "base/mac/foundation_util.h"
11 #include "components/reading_list/core/reading_list_switches.h"
12 #import "ios/chrome/browser/ui/activity_services/activity_type_util.h" 11 #import "ios/chrome/browser/ui/activity_services/activity_type_util.h"
13 #import "ios/chrome/browser/ui/activity_services/appex_constants.h" 12 #import "ios/chrome/browser/ui/activity_services/appex_constants.h"
14 #import "ios/chrome/browser/ui/activity_services/chrome_activity_item_source.h" 13 #import "ios/chrome/browser/ui/activity_services/chrome_activity_item_source.h"
15 #import "ios/chrome/browser/ui/activity_services/print_activity.h" 14 #import "ios/chrome/browser/ui/activity_services/print_activity.h"
16 #import "ios/chrome/browser/ui/activity_services/reading_list_activity.h" 15 #import "ios/chrome/browser/ui/activity_services/reading_list_activity.h"
17 #import "ios/chrome/browser/ui/activity_services/share_protocol.h" 16 #import "ios/chrome/browser/ui/activity_services/share_protocol.h"
18 #import "ios/chrome/browser/ui/activity_services/share_to_data.h" 17 #import "ios/chrome/browser/ui/activity_services/share_to_data.h"
19 #include "ios/chrome/browser/ui/ui_util.h" 18 #include "ios/chrome/browser/ui/ui_util.h"
20 19
21 #if !defined(__has_feature) || !__has_feature(objc_arc) 20 #if !defined(__has_feature) || !__has_feature(objc_arc)
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 } 210 }
212 211
213 - (NSArray*)applicationActivitiesForData:(ShareToData*)data 212 - (NSArray*)applicationActivitiesForData:(ShareToData*)data
214 controller:(UIViewController*)controller { 213 controller:(UIViewController*)controller {
215 NSMutableArray* applicationActivities = [NSMutableArray array]; 214 NSMutableArray* applicationActivities = [NSMutableArray array];
216 if (data.isPagePrintable) { 215 if (data.isPagePrintable) {
217 PrintActivity* printActivity = [[PrintActivity alloc] init]; 216 PrintActivity* printActivity = [[PrintActivity alloc] init];
218 [printActivity setResponder:controller]; 217 [printActivity setResponder:controller];
219 [applicationActivities addObject:printActivity]; 218 [applicationActivities addObject:printActivity];
220 } 219 }
221 if (reading_list::switches::IsReadingListEnabled() && 220 if (data.url.SchemeIsHTTPOrHTTPS()) {
222 data.url.SchemeIsHTTPOrHTTPS()) {
223 ReadingListActivity* readingListActivity = 221 ReadingListActivity* readingListActivity =
224 [[ReadingListActivity alloc] initWithURL:data.url 222 [[ReadingListActivity alloc] initWithURL:data.url
225 title:data.title 223 title:data.title
226 responder:controller]; 224 responder:controller];
227 [applicationActivities addObject:readingListActivity]; 225 [applicationActivities addObject:readingListActivity];
228 } 226 }
229 return applicationActivities; 227 return applicationActivities;
230 } 228 }
231 229
232 - (BOOL)processItemsReturnedFromActivity:(NSString*)activityType 230 - (BOOL)processItemsReturnedFromActivity:(NSString*)activityType
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 return NO; 289 return NO;
292 } 290 }
293 291
294 #pragma mark - For Testing 292 #pragma mark - For Testing
295 293
296 - (void)setShareToDelegateForTesting:(id<ShareToDelegate>)delegate { 294 - (void)setShareToDelegateForTesting:(id<ShareToDelegate>)delegate {
297 shareToDelegate_ = delegate; 295 shareToDelegate_ = delegate;
298 } 296 }
299 297
300 @end 298 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698