| 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_bar_controller.h" | 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" |
| 6 | 6 |
| 7 #include "base/mac/bundle_locations.h" | 7 #include "base/mac/bundle_locations.h" |
| 8 #include "base/mac/mac_util.h" | 8 #include "base/mac/mac_util.h" |
| 9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 931 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 942 return NO; | 942 return NO; |
| 943 } | 943 } |
| 944 | 944 |
| 945 return YES; | 945 return YES; |
| 946 } | 946 } |
| 947 | 947 |
| 948 // Actually open the URL. This is the last chance for a unit test to | 948 // Actually open the URL. This is the last chance for a unit test to |
| 949 // override. | 949 // override. |
| 950 - (void)openURL:(GURL)url disposition:(WindowOpenDisposition)disposition { | 950 - (void)openURL:(GURL)url disposition:(WindowOpenDisposition)disposition { |
| 951 OpenURLParams params( | 951 OpenURLParams params( |
| 952 url, Referrer(), disposition, content::PAGE_TRANSITION_AUTO_BOOKMARK, | 952 url, Referrer(), disposition, ui::PAGE_TRANSITION_AUTO_BOOKMARK, |
| 953 false); | 953 false); |
| 954 browser_->OpenURL(params); | 954 browser_->OpenURL(params); |
| 955 } | 955 } |
| 956 | 956 |
| 957 - (void)clearMenuTagMap { | 957 - (void)clearMenuTagMap { |
| 958 seedId_ = 0; | 958 seedId_ = 0; |
| 959 menuTagMap_.clear(); | 959 menuTagMap_.clear(); |
| 960 } | 960 } |
| 961 | 961 |
| 962 - (int)preferredHeight { | 962 - (int)preferredHeight { |
| (...skipping 1835 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2798 - (id<BookmarkButtonControllerProtocol>)controllerForNode: | 2798 - (id<BookmarkButtonControllerProtocol>)controllerForNode: |
| 2799 (const BookmarkNode*)node { | 2799 (const BookmarkNode*)node { |
| 2800 // See if it's in the bar, then if it is in the hierarchy of visible | 2800 // See if it's in the bar, then if it is in the hierarchy of visible |
| 2801 // folder menus. | 2801 // folder menus. |
| 2802 if (bookmarkModel_->bookmark_bar_node() == node) | 2802 if (bookmarkModel_->bookmark_bar_node() == node) |
| 2803 return self; | 2803 return self; |
| 2804 return [folderController_ controllerForNode:node]; | 2804 return [folderController_ controllerForNode:node]; |
| 2805 } | 2805 } |
| 2806 | 2806 |
| 2807 @end | 2807 @end |
| OLD | NEW |