Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/mac/bundle_locations.h" | 8 #include "base/mac/bundle_locations.h" |
| 9 #include "base/strings/sys_string_conversions.h" | 9 #include "base/strings/sys_string_conversions.h" |
| 10 #include "chrome/browser/ui/browser_finder.h" | 10 #include "chrome/browser/ui/browser_finder.h" |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 81 addObserver:self | 81 addObserver:self |
| 82 selector:@selector(findPboardUpdated:) | 82 selector:@selector(findPboardUpdated:) |
| 83 name:kFindPasteboardChangedNotification | 83 name:kFindPasteboardChangedNotification |
| 84 object:[FindPasteboard sharedInstance]]; | 84 object:[FindPasteboard sharedInstance]]; |
| 85 browser_ = browser; | 85 browser_ = browser; |
| 86 } | 86 } |
| 87 return self; | 87 return self; |
| 88 } | 88 } |
| 89 | 89 |
| 90 - (void)dealloc { | 90 - (void)dealloc { |
| 91 [self browserWillBeDestroyed]; | |
|
erikchen
2015/07/08 18:02:17
I recommended that you make a new method called -c
Robert Sesek
2015/07/08 22:15:18
I kind of agree, but I don't know if adding this e
| |
| 92 [super dealloc]; | |
| 93 } | |
| 94 | |
| 95 - (void)browserWillBeDestroyed { | |
| 91 // All animations should have been explicitly stopped before a tab is closed. | 96 // All animations should have been explicitly stopped before a tab is closed. |
| 92 DCHECK(!showHideAnimation_.get()); | 97 DCHECK(!showHideAnimation_.get()); |
| 93 DCHECK(!moveAnimation_.get()); | 98 DCHECK(!moveAnimation_.get()); |
| 94 [[NSNotificationCenter defaultCenter] removeObserver:self]; | 99 [[NSNotificationCenter defaultCenter] removeObserver:self]; |
| 95 [super dealloc]; | 100 browser_ = nullptr; |
| 96 } | 101 } |
| 97 | 102 |
| 98 - (void)setFindBarBridge:(FindBarBridge*)findBarBridge { | 103 - (void)setFindBarBridge:(FindBarBridge*)findBarBridge { |
| 99 DCHECK(!findBarBridge_); // should only be called once. | 104 DCHECK(!findBarBridge_); // should only be called once. |
| 100 findBarBridge_ = findBarBridge; | 105 findBarBridge_ = findBarBridge; |
| 101 } | 106 } |
| 102 | 107 |
| 103 - (void)awakeFromNib { | 108 - (void)awakeFromNib { |
| 104 [[closeButton_ cell] setImageID:IDR_CLOSE_1 | 109 [[closeButton_ cell] setImageID:IDR_CLOSE_1 |
| 105 forButtonState:image_button_cell::kDefaultState]; | 110 forButtonState:image_button_cell::kDefaultState]; |
| (...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 615 } | 620 } |
| 616 | 621 |
| 617 - (BrowserWindowController*)browserWindowController { | 622 - (BrowserWindowController*)browserWindowController { |
| 618 if (!browser_) | 623 if (!browser_) |
| 619 return nil; | 624 return nil; |
| 620 return [BrowserWindowController | 625 return [BrowserWindowController |
| 621 browserWindowControllerForWindow:browser_->window()->GetNativeWindow()]; | 626 browserWindowControllerForWindow:browser_->window()->GetNativeWindow()]; |
| 622 } | 627 } |
| 623 | 628 |
| 624 @end | 629 @end |
| OLD | NEW |