| 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/location_bar_view_mac.h" | 5 #import "chrome/browser/cocoa/location_bar_view_mac.h" |
| 6 | 6 |
| 7 #include "app/l10n_util_mac.h" | 7 #include "app/l10n_util_mac.h" |
| 8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
| 9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
| 10 #include "base/nsimage_cache_mac.h" | 10 #include "base/nsimage_cache_mac.h" |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 min_string = description.substr(0, chop_index); | 86 min_string = description.substr(0, chop_index); |
| 87 } | 87 } |
| 88 base::i18n::AdjustStringForLocaleDirection(min_string, &min_string); | 88 base::i18n::AdjustStringForLocaleDirection(min_string, &min_string); |
| 89 return min_string; | 89 return min_string; |
| 90 } | 90 } |
| 91 | 91 |
| 92 } // namespace | 92 } // namespace |
| 93 | 93 |
| 94 LocationBarViewMac::LocationBarViewMac( | 94 LocationBarViewMac::LocationBarViewMac( |
| 95 AutocompleteTextField* field, | 95 AutocompleteTextField* field, |
| 96 const BubblePositioner* bubble_positioner, | |
| 97 CommandUpdater* command_updater, | 96 CommandUpdater* command_updater, |
| 98 ToolbarModel* toolbar_model, | 97 ToolbarModel* toolbar_model, |
| 99 Profile* profile, | 98 Profile* profile, |
| 100 Browser* browser) | 99 Browser* browser) |
| 101 : edit_view_(new AutocompleteEditViewMac(this, bubble_positioner, | 100 : edit_view_(new AutocompleteEditViewMac(this, toolbar_model, profile, |
| 102 toolbar_model, profile, command_updater, field)), | 101 command_updater, field)), |
| 103 command_updater_(command_updater), | 102 command_updater_(command_updater), |
| 104 field_(field), | 103 field_(field), |
| 105 disposition_(CURRENT_TAB), | 104 disposition_(CURRENT_TAB), |
| 106 location_icon_view_(this), | 105 location_icon_view_(this), |
| 107 security_label_view_(), | 106 security_label_view_(), |
| 108 star_icon_view_(command_updater), | 107 star_icon_view_(command_updater), |
| 109 page_action_views_(this, profile, toolbar_model), | 108 page_action_views_(this, profile, toolbar_model), |
| 110 profile_(profile), | 109 profile_(profile), |
| 111 browser_(browser), | 110 browser_(browser), |
| 112 toolbar_model_(toolbar_model), | 111 toolbar_model_(toolbar_model), |
| (...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 968 ++result; | 967 ++result; |
| 969 } | 968 } |
| 970 return result; | 969 return result; |
| 971 } | 970 } |
| 972 | 971 |
| 973 void LocationBarViewMac::PageActionViewList::OnMousePressed(NSRect iconFrame, | 972 void LocationBarViewMac::PageActionViewList::OnMousePressed(NSRect iconFrame, |
| 974 size_t index) { | 973 size_t index) { |
| 975 ViewAt(index)->OnMousePressed(iconFrame); | 974 ViewAt(index)->OnMousePressed(iconFrame); |
| 976 } | 975 } |
| 977 | 976 |
| OLD | NEW |