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

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

Issue 2942003002: [ios] Fix "return foo = nil" introduced by ARC conversion tools. (Closed)
Patch Set: Created 3 years, 6 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/sync_encryption_passphrase_collection_vi ew_controller.h" 5 #import "ios/chrome/browser/ui/settings/sync_encryption_passphrase_collection_vi ew_controller.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/i18n/time_formatting.h" 9 #include "base/i18n/time_formatting.h"
10 #include "base/mac/foundation_util.h" 10 #include "base/mac/foundation_util.h"
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 spinnerFrame.origin.y = kSpinnerButtonPadding; 474 spinnerFrame.origin.y = kSpinnerButtonPadding;
475 [spinner setFrame:spinnerFrame]; 475 [spinner setFrame:spinnerFrame];
476 [customView addSubview:spinner]; 476 [customView addSubview:spinner];
477 477
478 UIBarButtonItem* leftBarButtonItem = 478 UIBarButtonItem* leftBarButtonItem =
479 [[UIBarButtonItem alloc] initWithCustomView:customView]; 479 [[UIBarButtonItem alloc] initWithCustomView:customView];
480 480
481 [spinner setHidesWhenStopped:NO]; 481 [spinner setHidesWhenStopped:NO];
482 [spinner startAnimating]; 482 [spinner startAnimating];
483 483
484 return leftBarButtonItem = nil; 484 return leftBarButtonItem;
485 } 485 }
486 486
487 - (void)stopObserving { 487 - (void)stopObserving {
488 // Stops observing the sync service. This is required during the shutdown 488 // Stops observing the sync service. This is required during the shutdown
489 // phase to avoid observing sync events for a browser state that is being 489 // phase to avoid observing sync events for a browser state that is being
490 // killed. 490 // killed.
491 syncObserver_.reset(); 491 syncObserver_.reset();
492 tokenServiceObserver_.reset(); 492 tokenServiceObserver_.reset();
493 } 493 }
494 494
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 self.navigationController) popViewControllerOrCloseSettingsAnimated:NO]; 567 self.navigationController) popViewControllerOrCloseSettingsAnimated:NO];
568 } 568 }
569 569
570 #pragma mark - SettingsControllerProtocol callbacks 570 #pragma mark - SettingsControllerProtocol callbacks
571 571
572 - (void)settingsWillBeDismissed { 572 - (void)settingsWillBeDismissed {
573 [self stopObserving]; 573 [self stopObserving];
574 } 574 }
575 575
576 @end 576 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698