OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h" | 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h" |
6 | 6 |
| 7 #include "app/mac/nsimage_cache.h" |
7 #include "base/mac_util.h" | 8 #include "base/mac_util.h" |
8 #include "base/nsimage_cache_mac.h" | |
9 #include "base/sys_string_conversions.h" | 9 #include "base/sys_string_conversions.h" |
10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
11 #include "chrome/browser/bookmarks/bookmark_utils.h" | 11 #include "chrome/browser/bookmarks/bookmark_utils.h" |
12 #import "chrome/browser/themes/browser_theme_provider.h" | 12 #import "chrome/browser/themes/browser_theme_provider.h" |
13 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" | 13 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" |
14 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" | 14 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" |
15 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h" | 15 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h" |
16 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h" | 16 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h" |
17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h" | 17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h" |
18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h" | 18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h" |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 | 124 |
125 parentController_.reset([parentController retain]); | 125 parentController_.reset([parentController retain]); |
126 if (!parentController_) | 126 if (!parentController_) |
127 [self setSubFolderGrowthToRight:YES]; | 127 [self setSubFolderGrowthToRight:YES]; |
128 else | 128 else |
129 [self setSubFolderGrowthToRight:[parentController | 129 [self setSubFolderGrowthToRight:[parentController |
130 subFolderGrowthToRight]]; | 130 subFolderGrowthToRight]]; |
131 barController_ = barController; // WEAK | 131 barController_ = barController; // WEAK |
132 buttons_.reset([[NSMutableArray alloc] init]); | 132 buttons_.reset([[NSMutableArray alloc] init]); |
133 folderTarget_.reset([[BookmarkFolderTarget alloc] initWithController:self]); | 133 folderTarget_.reset([[BookmarkFolderTarget alloc] initWithController:self]); |
134 NSImage* image = nsimage_cache::ImageNamed(@"menu_overflow_up.pdf"); | 134 NSImage* image = app::mac::GetCachedImageWithName(@"menu_overflow_up.pdf"); |
135 DCHECK(image); | 135 DCHECK(image); |
136 verticalScrollArrowHeight_ = [image size].height; | 136 verticalScrollArrowHeight_ = [image size].height; |
137 [self configureWindow]; | 137 [self configureWindow]; |
138 hoverState_.reset([[BookmarkBarFolderHoverState alloc] init]); | 138 hoverState_.reset([[BookmarkBarFolderHoverState alloc] init]); |
139 } | 139 } |
140 return self; | 140 return self; |
141 } | 141 } |
142 | 142 |
143 - (void)dealloc { | 143 - (void)dealloc { |
144 // The button is no longer part of the menu path. | 144 // The button is no longer part of the menu path. |
(...skipping 1305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1450 | 1450 |
1451 - (void)setIgnoreAnimations:(BOOL)ignore { | 1451 - (void)setIgnoreAnimations:(BOOL)ignore { |
1452 ignoreAnimations_ = ignore; | 1452 ignoreAnimations_ = ignore; |
1453 } | 1453 } |
1454 | 1454 |
1455 - (BookmarkButton*)buttonThatMouseIsIn { | 1455 - (BookmarkButton*)buttonThatMouseIsIn { |
1456 return buttonThatMouseIsIn_; | 1456 return buttonThatMouseIsIn_; |
1457 } | 1457 } |
1458 | 1458 |
1459 @end // BookmarkBarFolderController | 1459 @end // BookmarkBarFolderController |
OLD | NEW |