| 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/cocoa/bookmark_bubble_controller.h" | 5 #import "chrome/browser/cocoa/bookmark_bubble_controller.h" |
| 6 |
| 6 #include "app/l10n_util_mac.h" | 7 #include "app/l10n_util_mac.h" |
| 7 #include "base/mac_util.h" | 8 #include "base/mac_util.h" |
| 8 #include "base/sys_string_conversions.h" | 9 #include "base/sys_string_conversions.h" |
| 9 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 10 #import "chrome/browser/cocoa/bookmark_button.h" | 11 #import "chrome/browser/cocoa/bookmark_button.h" |
| 11 #import "chrome/browser/cocoa/browser_window_controller.h" | 12 #import "chrome/browser/cocoa/browser_window_controller.h" |
| 12 #import "chrome/browser/cocoa/info_bubble_view.h" | 13 #import "chrome/browser/cocoa/info_bubble_view.h" |
| 13 #include "chrome/browser/metrics/user_metrics.h" | 14 #include "chrome/browser/metrics/user_metrics.h" |
| 14 #include "chrome/common/notification_observer.h" | 15 #include "chrome/common/notification_observer.h" |
| 15 #include "chrome/common/notification_registrar.h" | 16 #include "chrome/common/notification_registrar.h" |
| (...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 416 NSInteger idx = [menu indexOfItemWithRepresentedObject:parentValue]; | 417 NSInteger idx = [menu indexOfItemWithRepresentedObject:parentValue]; |
| 417 DCHECK(idx != -1); | 418 DCHECK(idx != -1); |
| 418 [folderPopUpButton_ selectItemAtIndex:idx]; | 419 [folderPopUpButton_ selectItemAtIndex:idx]; |
| 419 } | 420 } |
| 420 | 421 |
| 421 - (NSPopUpButton*)folderPopUpButton { | 422 - (NSPopUpButton*)folderPopUpButton { |
| 422 return folderPopUpButton_; | 423 return folderPopUpButton_; |
| 423 } | 424 } |
| 424 | 425 |
| 425 @end // implementation BookmarkBubbleController(ExposedForUnitTesting) | 426 @end // implementation BookmarkBubbleController(ExposedForUnitTesting) |
| OLD | NEW |