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

Side by Side Diff: chrome/browser/cocoa/bookmark_bar_controller.mm

Issue 334029: Add TODOs. (Closed)
Patch Set: Created 11 years, 1 month 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 | « no previous file | chrome/browser/cocoa/download_shelf_controller.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 #include "app/l10n_util_mac.h" 5 #include "app/l10n_util_mac.h"
6 #include "app/resource_bundle.h" 6 #include "app/resource_bundle.h"
7 #include "base/mac_util.h" 7 #include "base/mac_util.h"
8 #include "base/sys_string_conversions.h" 8 #include "base/sys_string_conversions.h"
9 #include "chrome/browser/bookmarks/bookmark_editor.h" 9 #include "chrome/browser/bookmarks/bookmark_editor.h"
10 #include "chrome/browser/bookmarks/bookmark_model.h" 10 #include "chrome/browser/bookmarks/bookmark_model.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 76 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
77 folderImage_.reset([rb.GetNSImageNamed(IDR_BOOKMARK_BAR_FOLDER) retain]); 77 folderImage_.reset([rb.GetNSImageNamed(IDR_BOOKMARK_BAR_FOLDER) retain]);
78 } 78 }
79 return self; 79 return self;
80 } 80 }
81 81
82 - (void)dealloc { 82 - (void)dealloc {
83 // Remove our view from its superview so it doesn't attempt to reference 83 // Remove our view from its superview so it doesn't attempt to reference
84 // it when the controller is gone. 84 // it when the controller is gone.
85 //TODO(dmaclach): Remove -- http://crbug.com/25845
85 [[self view] removeFromSuperview]; 86 [[self view] removeFromSuperview];
87
86 bridge_.reset(NULL); 88 bridge_.reset(NULL);
87 [[NSNotificationCenter defaultCenter] removeObserver:self]; 89 [[NSNotificationCenter defaultCenter] removeObserver:self];
88 [super dealloc]; 90 [super dealloc];
89 } 91 }
90 92
91 - (void)awakeFromNib { 93 - (void)awakeFromNib {
92 // We default to NOT open, which means height=0. 94 // We default to NOT open, which means height=0.
93 DCHECK([[self view] isHidden]); // Hidden so it's OK to change. 95 DCHECK([[self view] isHidden]); // Hidden so it's OK to change.
94 96
95 // Set our initial height to zero, since that is what the superview 97 // Set our initial height to zero, since that is what the superview
(...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 761
760 - (void)setUrlDelegate:(id<BookmarkURLOpener>)urlDelegate { 762 - (void)setUrlDelegate:(id<BookmarkURLOpener>)urlDelegate {
761 urlDelegate_ = urlDelegate; 763 urlDelegate_ = urlDelegate;
762 } 764 }
763 765
764 - (NSArray*)buttons { 766 - (NSArray*)buttons {
765 return buttons_.get(); 767 return buttons_.get();
766 } 768 }
767 769
768 @end 770 @end
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/cocoa/download_shelf_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698