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

Unified Diff: chrome/browser/ui/cocoa/toolbar/toolbar_controller.h

Issue 1221173003: [Mac] Inform reference counted objects that hold a weak Browser* when the Browser is being destroye… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add HasWeakBrowserPointer protocol. Allow -dealloc without preceding -browserWillBeDestroyed. Created 5 years, 5 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
Index: chrome/browser/ui/cocoa/toolbar/toolbar_controller.h
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h
index 514a6a8d2437a5de2ac87cf8e34b2f0ecb1654dc..b6f5814df7cab9feedf8b252d5b11293e0dc3f54 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h
@@ -10,6 +10,7 @@
#include "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#include "base/prefs/pref_member.h"
+#import "chrome/browser/ui/cocoa/has_weak_browser_pointer.h"
#import "chrome/browser/ui/cocoa/url_drop_target.h"
#import "chrome/browser/ui/cocoa/view_resizer.h"
#import "ui/base/cocoa/tracking_area.h"
@@ -43,7 +44,8 @@ class NotificationBridge;
// Manages the bookmark bar and its position in the window relative to
// the web content view.
-@interface ToolbarController : NSViewController<URLDropTargetController> {
+@interface ToolbarController
+ : NSViewController<URLDropTargetController, HasWeakBrowserPointer> {
@protected
// The ordering is important for unit tests. If new items are added or the
// ordering is changed, make sure to update |-toolbarViews| and the
@@ -64,7 +66,6 @@ class NotificationBridge;
scoped_ptr<LocationBarViewMac> locationBarView_;
base::scoped_nsobject<AutocompleteTextFieldEditor>
autocompleteTextFieldEditor_;
- id<ViewResizer> resizeDelegate_; // weak
base::scoped_nsobject<BackForwardMenuController> backMenuController_;
base::scoped_nsobject<BackForwardMenuController> forwardMenuController_;
base::scoped_nsobject<BrowserActionsController> browserActionsController_;
@@ -101,8 +102,7 @@ class NotificationBridge;
// the toolbar model and back/forward menus.
- (id)initWithCommands:(CommandUpdater*)commands
profile:(Profile*)profile
- browser:(Browser*)browser
- resizeDelegate:(id<ViewResizer>)resizeDelegate;
+ browser:(Browser*)browser;
// Get the C++ bridge object representing the location bar for this tab.
- (LocationBarViewMac*)locationBarBridge;
@@ -190,7 +190,6 @@ class NotificationBridge;
- (id)initWithCommands:(CommandUpdater*)commands
profile:(Profile*)profile
browser:(Browser*)browser
- resizeDelegate:(id<ViewResizer>)resizeDelegate
nibFileNamed:(NSString*)nibName;
@end

Powered by Google App Engine
This is Rietveld 408576698