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 #ifndef CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_ | 5 #ifndef CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_ |
6 #define CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_ | 6 #define CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <map> | 9 #include <map> |
10 #include <vector> | 10 #include <vector> |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 NSImage* GetTabButtonImage(); | 127 NSImage* GetTabButtonImage(); |
128 AutocompleteTextField* GetAutocompleteTextField() { return field_; } | 128 AutocompleteTextField* GetAutocompleteTextField() { return field_; } |
129 | 129 |
130 // Internals of OnChanged(), pulled out for purposes of unit | 130 // Internals of OnChanged(), pulled out for purposes of unit |
131 // testing. Sets up |field| based on the parameters, which are | 131 // testing. Sets up |field| based on the parameters, which are |
132 // pulled from edit_view->model(). | 132 // pulled from edit_view->model(). |
133 static void OnChangedImpl(AutocompleteTextField* field, | 133 static void OnChangedImpl(AutocompleteTextField* field, |
134 const std::wstring& keyword, | 134 const std::wstring& keyword, |
135 const std::wstring& short_name, | 135 const std::wstring& short_name, |
136 const bool is_keyword_hint, | 136 const bool is_keyword_hint, |
| 137 const bool is_extension_keyword, |
137 NSImage* image); | 138 NSImage* image); |
138 | 139 |
139 // Overridden from NotificationObserver. | 140 // Overridden from NotificationObserver. |
140 virtual void Observe(NotificationType type, | 141 virtual void Observe(NotificationType type, |
141 const NotificationSource& source, | 142 const NotificationSource& source, |
142 const NotificationDetails& details); | 143 const NotificationDetails& details); |
143 | 144 |
144 // Used to display a clickable icon in the location bar. | 145 // Used to display a clickable icon in the location bar. |
145 class LocationBarImageView { | 146 class LocationBarImageView { |
146 public: | 147 public: |
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
468 // The transition type to use for the navigation. | 469 // The transition type to use for the navigation. |
469 PageTransition::Type transition_; | 470 PageTransition::Type transition_; |
470 | 471 |
471 // Used to register for notifications received by NotificationObserver. | 472 // Used to register for notifications received by NotificationObserver. |
472 NotificationRegistrar registrar_; | 473 NotificationRegistrar registrar_; |
473 | 474 |
474 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); | 475 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); |
475 }; | 476 }; |
476 | 477 |
477 #endif // CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_ | 478 #endif // CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_ |
OLD | NEW |