| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_bubble_controller.h" | 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h" |
| 6 | 6 |
| 7 #include "base/mac/bundle_locations.h" | 7 #include "base/mac/bundle_locations.h" |
| 8 #include "base/strings/sys_string_conversions.h" | 8 #include "base/strings/sys_string_conversions.h" |
| 9 #include "chrome/browser/bookmarks/chrome_bookmark_client.h" | 9 #include "chrome/browser/bookmarks/chrome_bookmark_client.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| 11 #include "chrome/browser/ui/browser_finder.h" | 11 #include "chrome/browser/ui/browser_finder.h" |
| 12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" | 12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" |
| 13 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.h" | 13 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.h" |
| 14 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 14 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 15 #import "chrome/browser/ui/cocoa/info_bubble_view.h" | 15 #import "chrome/browser/ui/cocoa/info_bubble_view.h" |
| 16 #include "chrome/browser/ui/sync/sync_promo_ui.h" | 16 #include "chrome/browser/ui/sync/sync_promo_ui.h" |
| 17 #include "chrome/grit/generated_resources.h" | 17 #include "chrome/grit/generated_resources.h" |
| 18 #include "components/bookmarks/browser/bookmark_model.h" | 18 #include "components/bookmarks/browser/bookmark_model.h" |
| 19 #include "components/bookmarks/browser/bookmark_utils.h" | 19 #include "components/bookmarks/browser/bookmark_utils.h" |
| 20 #include "content/public/browser/notification_observer.h" | 20 #include "content/public/browser/notification_observer.h" |
| 21 #include "content/public/browser/notification_registrar.h" | 21 #include "content/public/browser/notification_registrar.h" |
| 22 #include "content/public/browser/notification_service.h" | 22 #include "content/public/browser/notification_service.h" |
| 23 #include "content/public/browser/user_metrics.h" | 23 #include "content/public/browser/user_metrics.h" |
| 24 #include "ui/base/l10n/l10n_util_mac.h" | 24 #include "ui/base/l10n/l10n_util_mac.h" |
| 25 | 25 |
| 26 using base::UserMetricsAction; | 26 using base::UserMetricsAction; |
| 27 using bookmarks::BookmarkModel; | 27 using bookmarks::BookmarkModel; |
| 28 using bookmarks::BookmarkNode; |
| 28 | 29 |
| 29 // An object to represent the ChooseAnotherFolder item in the pop up. | 30 // An object to represent the ChooseAnotherFolder item in the pop up. |
| 30 @interface ChooseAnotherFolder : NSObject | 31 @interface ChooseAnotherFolder : NSObject |
| 31 @end | 32 @end |
| 32 | 33 |
| 33 @implementation ChooseAnotherFolder | 34 @implementation ChooseAnotherFolder |
| 34 @end | 35 @end |
| 35 | 36 |
| 36 @interface BookmarkBubbleController (PrivateAPI) | 37 @interface BookmarkBubbleController (PrivateAPI) |
| 37 - (void)updateBookmarkNode; | 38 - (void)updateBookmarkNode; |
| (...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 401 NSInteger idx = [menu indexOfItemWithRepresentedObject:parentValue]; | 402 NSInteger idx = [menu indexOfItemWithRepresentedObject:parentValue]; |
| 402 DCHECK(idx != -1); | 403 DCHECK(idx != -1); |
| 403 [folderPopUpButton_ selectItemAtIndex:idx]; | 404 [folderPopUpButton_ selectItemAtIndex:idx]; |
| 404 } | 405 } |
| 405 | 406 |
| 406 - (NSPopUpButton*)folderPopUpButton { | 407 - (NSPopUpButton*)folderPopUpButton { |
| 407 return folderPopUpButton_; | 408 return folderPopUpButton_; |
| 408 } | 409 } |
| 409 | 410 |
| 410 @end // implementation BookmarkBubbleController(ExposedForUnitTesting) | 411 @end // implementation BookmarkBubbleController(ExposedForUnitTesting) |
| OLD | NEW |