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 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 | 207 |
208 // Keyword hint decoration displayed on the right-hand side. | 208 // Keyword hint decoration displayed on the right-hand side. |
209 scoped_ptr<KeywordHintDecoration> keyword_hint_decoration_; | 209 scoped_ptr<KeywordHintDecoration> keyword_hint_decoration_; |
210 | 210 |
211 Profile* profile_; | 211 Profile* profile_; |
212 | 212 |
213 Browser* browser_; | 213 Browser* browser_; |
214 | 214 |
215 ToolbarModel* toolbar_model_; // Weak, owned by Browser. | 215 ToolbarModel* toolbar_model_; // Weak, owned by Browser. |
216 | 216 |
| 217 // Whether or not to update the instant preview. |
| 218 bool update_instant_; |
| 219 |
217 // The transition type to use for the navigation. | 220 // The transition type to use for the navigation. |
218 PageTransition::Type transition_; | 221 PageTransition::Type transition_; |
219 | 222 |
220 // Used to register for notifications received by NotificationObserver. | 223 // Used to register for notifications received by NotificationObserver. |
221 NotificationRegistrar registrar_; | 224 NotificationRegistrar registrar_; |
222 | 225 |
223 // Used to schedule a task for the first run info bubble. | 226 // Used to schedule a task for the first run info bubble. |
224 ScopedRunnableMethodFactory<LocationBarViewMac> first_run_bubble_; | 227 ScopedRunnableMethodFactory<LocationBarViewMac> first_run_bubble_; |
225 | 228 |
226 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); | 229 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); |
227 }; | 230 }; |
228 | 231 |
229 #endif // CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_ | 232 #endif // CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_ |
OLD | NEW |