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

Unified Diff: ios/chrome/browser/ui/settings/settings_navigation_controller.mm

Issue 2713173002: Don't dismiss Settings when another view controller is presented on top (Closed)
Patch Set: Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/settings/settings_navigation_controller.mm
diff --git a/ios/chrome/browser/ui/settings/settings_navigation_controller.mm b/ios/chrome/browser/ui/settings/settings_navigation_controller.mm
index e80c01d0d865533a44c393f80afad932a66ff53c..9cd26a2e3a2d264e574b569ba40c800919d61a15 100644
--- a/ios/chrome/browser/ui/settings/settings_navigation_controller.mm
+++ b/ios/chrome/browser/ui/settings/settings_navigation_controller.mm
@@ -542,6 +542,9 @@ initWithRootViewController:(UIViewController*)rootViewController
#pragma mark - UIResponder
- (NSArray*)keyCommands {
+ if ([self presentedViewController]) {
gambard 2017/02/24 12:33:28 Are you sure this is reset to nil when the present
lpromero 2017/02/27 16:55:52 Done. (Yes the property is correctly updated.)
+ return nil;
+ }
base::WeakNSObject<SettingsNavigationController> weakSelf(self);
return @[
[UIKeyCommand cr_keyCommandWithInput:UIKeyInputEscape
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698