| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_view.h" | 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h" |
| 6 | 6 |
| 7 #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h" | 7 #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #import "chrome/browser/themes/theme_properties.h" | 9 #import "chrome/browser/themes/theme_properties.h" |
| 10 #import "chrome/browser/themes/theme_service.h" | 10 #import "chrome/browser/themes/theme_service.h" |
| (...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 255 // Fall through.... | 255 // Fall through.... |
| 256 } | 256 } |
| 257 if ([pboard containsURLData]) { | 257 if ([pboard containsURLData]) { |
| 258 if ([self performDragOperationForURL:info]) | 258 if ([self performDragOperationForURL:info]) |
| 259 return YES; | 259 return YES; |
| 260 } | 260 } |
| 261 return NO; | 261 return NO; |
| 262 } | 262 } |
| 263 | 263 |
| 264 - (NSMenu*)menu { | 264 - (NSMenu*)menu { |
| 265 return [[controller_ menuController] menuForBookmarkNode:NULL]; | 265 return [[controller_ menuController] menuForBookmarkBar]; |
| 266 } | 266 } |
| 267 | 267 |
| 268 - (void)setController:(id)controller { | 268 - (void)setController:(id)controller { |
| 269 controller_ = controller; | 269 controller_ = controller; |
| 270 } | 270 } |
| 271 | 271 |
| 272 - (ViewID)viewID { | 272 - (ViewID)viewID { |
| 273 return VIEW_ID_BOOKMARK_BAR; | 273 return VIEW_ID_BOOKMARK_BAR; |
| 274 } | 274 } |
| 275 | 275 |
| 276 @end // @implementation BookmarkBarView | 276 @end // @implementation BookmarkBarView |
| 277 | 277 |
| 278 @implementation BookmarkBarTextField | 278 @implementation BookmarkBarTextField |
| 279 | 279 |
| 280 - (NSMenu*)menu { | 280 - (NSMenu*)menu { |
| 281 return [barView_ menu]; | 281 return [barView_ menu]; |
| 282 } | 282 } |
| 283 | 283 |
| 284 @end // @implementation BookmarkBarTextField | 284 @end // @implementation BookmarkBarTextField |
| 285 | 285 |
| 286 @implementation BookmarkBarItemContainer | 286 @implementation BookmarkBarItemContainer |
| 287 | 287 |
| 288 - (NSMenu*)menu { | 288 - (NSMenu*)menu { |
| 289 return [barView_ menu]; | 289 return [barView_ menu]; |
| 290 } | 290 } |
| 291 | 291 |
| 292 @end // @implementation BookmarkBarItemContainer | 292 @end // @implementation BookmarkBarItemContainer |
| OLD | NEW |