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

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

Issue 2804853002: Cancels payment request when Settings is tapped, and opens the Autofill settings page. (Closed)
Patch Set: Remove more strongSelf checks. 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
« no previous file with comments | « ios/chrome/browser/ui/settings/settings_navigation_controller.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_navigation_controller.h" 5 #import "ios/chrome/browser/ui/settings/settings_navigation_controller.h"
6 6
7 #include "base/ios/ios_util.h" 7 #include "base/ios/ios_util.h"
8 #import "base/ios/weak_nsobject.h" 8 #import "base/ios/weak_nsobject.h"
9 #include "base/mac/foundation_util.h" 9 #include "base/mac/foundation_util.h"
10 #import "base/mac/scoped_nsobject.h" 10 #import "base/mac/scoped_nsobject.h"
11 #include "components/strings/grit/components_strings.h" 11 #include "components/strings/grit/components_strings.h"
12 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" 12 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
13 #include "ios/chrome/browser/sync/sync_setup_service.h" 13 #include "ios/chrome/browser/sync/sync_setup_service.h"
14 #include "ios/chrome/browser/sync/sync_setup_service_factory.h" 14 #include "ios/chrome/browser/sync/sync_setup_service_factory.h"
15 #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h" 15 #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h"
16 #import "ios/chrome/browser/ui/commands/clear_browsing_data_command.h" 16 #import "ios/chrome/browser/ui/commands/clear_browsing_data_command.h"
17 #include "ios/chrome/browser/ui/commands/ios_command_ids.h" 17 #include "ios/chrome/browser/ui/commands/ios_command_ids.h"
18 #import "ios/chrome/browser/ui/commands/show_signin_command.h" 18 #import "ios/chrome/browser/ui/commands/show_signin_command.h"
19 #import "ios/chrome/browser/ui/icons/chrome_icon.h" 19 #import "ios/chrome/browser/ui/icons/chrome_icon.h"
20 #import "ios/chrome/browser/ui/keyboard/UIKeyCommand+Chrome.h" 20 #import "ios/chrome/browser/ui/keyboard/UIKeyCommand+Chrome.h"
21 #import "ios/chrome/browser/ui/material_components/app_bar_presenting.h" 21 #import "ios/chrome/browser/ui/material_components/app_bar_presenting.h"
22 #import "ios/chrome/browser/ui/material_components/utils.h" 22 #import "ios/chrome/browser/ui/material_components/utils.h"
23 #import "ios/chrome/browser/ui/settings/accounts_collection_view_controller.h" 23 #import "ios/chrome/browser/ui/settings/accounts_collection_view_controller.h"
24 #import "ios/chrome/browser/ui/settings/autofill_collection_view_controller.h"
24 #import "ios/chrome/browser/ui/settings/clear_browsing_data_collection_view_cont roller.h" 25 #import "ios/chrome/browser/ui/settings/clear_browsing_data_collection_view_cont roller.h"
25 #import "ios/chrome/browser/ui/settings/contextual_search_collection_view_contro ller.h" 26 #import "ios/chrome/browser/ui/settings/contextual_search_collection_view_contro ller.h"
26 #import "ios/chrome/browser/ui/settings/import_data_collection_view_controller.h " 27 #import "ios/chrome/browser/ui/settings/import_data_collection_view_controller.h "
27 #import "ios/chrome/browser/ui/settings/native_apps_collection_view_controller.h " 28 #import "ios/chrome/browser/ui/settings/native_apps_collection_view_controller.h "
28 #import "ios/chrome/browser/ui/settings/save_passwords_collection_view_controlle r.h" 29 #import "ios/chrome/browser/ui/settings/save_passwords_collection_view_controlle r.h"
29 #import "ios/chrome/browser/ui/settings/settings_collection_view_controller.h" 30 #import "ios/chrome/browser/ui/settings/settings_collection_view_controller.h"
30 #import "ios/chrome/browser/ui/settings/settings_utils.h" 31 #import "ios/chrome/browser/ui/settings/settings_utils.h"
31 #import "ios/chrome/browser/ui/settings/sync_encryption_passphrase_collection_vi ew_controller.h" 32 #import "ios/chrome/browser/ui/settings/sync_encryption_passphrase_collection_vi ew_controller.h"
32 #import "ios/chrome/browser/ui/settings/sync_settings_collection_view_controller .h" 33 #import "ios/chrome/browser/ui/settings/sync_settings_collection_view_controller .h"
33 #include "ios/chrome/browser/ui/ui_util.h" 34 #include "ios/chrome/browser/ui/ui_util.h"
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 initWithRootViewController:controller 276 initWithRootViewController:controller
276 browserState:browserState 277 browserState:browserState
277 delegate:delegate]; 278 delegate:delegate];
278 279
279 // Make sure the close button is always present, as the Save Passwords screen 280 // Make sure the close button is always present, as the Save Passwords screen
280 // isn't just shown from Settings. 281 // isn't just shown from Settings.
281 [controller navigationItem].leftBarButtonItem = [nc closeButton]; 282 [controller navigationItem].leftBarButtonItem = [nc closeButton];
282 return nc; 283 return nc;
283 } 284 }
284 285
286 + (SettingsNavigationController*)
287 newAutofillController:(ios::ChromeBrowserState*)browserState
288 delegate:(id<SettingsNavigationControllerDelegate>)delegate {
289 base::scoped_nsobject<UIViewController> controller(
290 [[AutofillCollectionViewController alloc]
291 initWithBrowserState:browserState]);
292
293 SettingsNavigationController* nc = [[SettingsNavigationController alloc]
294 initWithRootViewController:controller
295 browserState:browserState
296 delegate:delegate];
297 [controller navigationItem].rightBarButtonItem = [nc doneButton];
298
299 // Make sure the close button is always present, as the Autofill screen
300 // isn't just shown from Settings.
301 [controller navigationItem].leftBarButtonItem = [nc closeButton];
302 return nc;
303 }
304
285 #pragma mark - Lifecycle 305 #pragma mark - Lifecycle
286 306
287 - (instancetype) 307 - (instancetype)
288 initWithRootViewController:(UIViewController*)rootViewController 308 initWithRootViewController:(UIViewController*)rootViewController
289 browserState:(ios::ChromeBrowserState*)browserState 309 browserState:(ios::ChromeBrowserState*)browserState
290 delegate:(id<SettingsNavigationControllerDelegate>)delegate { 310 delegate:(id<SettingsNavigationControllerDelegate>)delegate {
291 DCHECK(browserState); 311 DCHECK(browserState);
292 DCHECK(!browserState->IsOffTheRecord()); 312 DCHECK(!browserState->IsOffTheRecord());
293 self = [super initWithRootViewController:rootViewController]; 313 self = [super initWithRootViewController:rootViewController];
294 if (self) { 314 if (self) {
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 return [NSValue valueWithPointer:controller]; 679 return [NSValue valueWithPointer:controller];
660 } 680 }
661 681
662 #pragma mark - UIResponder 682 #pragma mark - UIResponder
663 683
664 - (BOOL)canBecomeFirstResponder { 684 - (BOOL)canBecomeFirstResponder {
665 return YES; 685 return YES;
666 } 686 }
667 687
668 @end 688 @end
OLDNEW
« no previous file with comments | « ios/chrome/browser/ui/settings/settings_navigation_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698