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

Side by Side Diff: ios/chrome/browser/ui/settings/settings_collection_view_controller.mm

Issue 2860573003: Disables Native App Launcher functionality. (Closed)
Patch Set: fixed egtests compilation Created 3 years, 7 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 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/settings/settings_collection_view_controller.h" 5 #import "ios/chrome/browser/ui/settings/settings_collection_view_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 #import "base/mac/foundation_util.h" 10 #import "base/mac/foundation_util.h"
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 basicsHeader.text = l10n_util::GetNSString(IDS_IOS_OPTIONS_GENERAL_TAB_LABEL); 351 basicsHeader.text = l10n_util::GetNSString(IDS_IOS_OPTIONS_GENERAL_TAB_LABEL);
352 basicsHeader.textColor = [[MDCPalette greyPalette] tint500]; 352 basicsHeader.textColor = [[MDCPalette greyPalette] tint500];
353 [model setHeader:basicsHeader 353 [model setHeader:basicsHeader
354 forSectionWithIdentifier:SectionIdentifierBasics]; 354 forSectionWithIdentifier:SectionIdentifierBasics];
355 [model addItem:[self searchEngineDetailItem] 355 [model addItem:[self searchEngineDetailItem]
356 toSectionWithIdentifier:SectionIdentifierBasics]; 356 toSectionWithIdentifier:SectionIdentifierBasics];
357 [model addItem:[self savePasswordsDetailItem] 357 [model addItem:[self savePasswordsDetailItem]
358 toSectionWithIdentifier:SectionIdentifierBasics]; 358 toSectionWithIdentifier:SectionIdentifierBasics];
359 [model addItem:[self autoFillDetailItem] 359 [model addItem:[self autoFillDetailItem]
360 toSectionWithIdentifier:SectionIdentifierBasics]; 360 toSectionWithIdentifier:SectionIdentifierBasics];
361 [model addItem:[self nativeAppsDetailItem] 361 if (experimental_flags::IsNativeAppLauncherEnabled()) {
362 toSectionWithIdentifier:SectionIdentifierBasics]; 362 [model addItem:[self nativeAppsDetailItem]
363 toSectionWithIdentifier:SectionIdentifierBasics];
364 }
363 365
364 // Advanced Section 366 // Advanced Section
365 [model addSectionWithIdentifier:SectionIdentifierAdvanced]; 367 [model addSectionWithIdentifier:SectionIdentifierAdvanced];
366 CollectionViewTextItem* advancedHeader = [ 368 CollectionViewTextItem* advancedHeader = [
367 [[CollectionViewTextItem alloc] initWithType:ItemTypeHeader] autorelease]; 369 [[CollectionViewTextItem alloc] initWithType:ItemTypeHeader] autorelease];
368 advancedHeader.text = 370 advancedHeader.text =
369 l10n_util::GetNSString(IDS_IOS_OPTIONS_ADVANCED_TAB_LABEL); 371 l10n_util::GetNSString(IDS_IOS_OPTIONS_ADVANCED_TAB_LABEL);
370 advancedHeader.textColor = [[MDCPalette greyPalette] tint500]; 372 advancedHeader.textColor = [[MDCPalette greyPalette] tint500];
371 [model setHeader:advancedHeader 373 [model setHeader:advancedHeader
372 forSectionWithIdentifier:SectionIdentifierAdvanced]; 374 forSectionWithIdentifier:SectionIdentifierAdvanced];
(...skipping 785 matching lines...) Expand 10 before | Expand all | Expand 10 after
1158 if (signinPromoItem) { 1160 if (signinPromoItem) {
1159 signinPromoItem.configurator = configurator; 1161 signinPromoItem.configurator = configurator;
1160 [self reconfigureCellsForItems:@[ signinPromoItem ] 1162 [self reconfigureCellsForItems:@[ signinPromoItem ]
1161 inSectionWithIdentifier:SectionIdentifierSignIn]; 1163 inSectionWithIdentifier:SectionIdentifierSignIn];
1162 if (newIdentity) 1164 if (newIdentity)
1163 [self.collectionViewLayout invalidateLayout]; 1165 [self.collectionViewLayout invalidateLayout];
1164 } 1166 }
1165 } 1167 }
1166 1168
1167 @end 1169 @end
OLDNEW
« no previous file with comments | « ios/chrome/browser/tabs/tab_unittest.mm ('k') | ios/chrome/browser/ui/settings/settings_egtest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698