OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 #import <Cocoa/Cocoa.h> | 8 #import <Cocoa/Cocoa.h> |
9 | 9 |
10 #include "base/scoped_nsobject.h" | 10 #include "base/scoped_nsobject.h" |
11 #include "base/scoped_ptr.h" | 11 #include "base/scoped_ptr.h" |
12 #include "chrome/browser/autocomplete/autocomplete_edit.h" | 12 #include "chrome/browser/autocomplete/autocomplete_edit.h" |
13 #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" | 13 #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" |
14 #include "chrome/browser/location_bar.h" | 14 #include "chrome/browser/location_bar.h" |
15 | 15 |
| 16 class AutocompletePopupPositioner; |
16 @class AutocompleteTextField; | 17 @class AutocompleteTextField; |
17 class CommandUpdater; | 18 class CommandUpdater; |
18 class Profile; | 19 class Profile; |
19 class ToolbarModel; | 20 class ToolbarModel; |
20 | 21 |
21 // A C++ bridge class that represents the location bar UI element to | 22 // A C++ bridge class that represents the location bar UI element to |
22 // the portable code. Wires up an AutocompleteEditViewMac instance to | 23 // the portable code. Wires up an AutocompleteEditViewMac instance to |
23 // the location bar text field, which handles most of the work. | 24 // the location bar text field, which handles most of the work. |
24 | 25 |
25 class LocationBarViewMac : public AutocompleteEditController, | 26 class LocationBarViewMac : public AutocompleteEditController, |
26 public LocationBar, | 27 public LocationBar, |
27 public LocationBarTesting { | 28 public LocationBarTesting { |
28 public: | 29 public: |
29 LocationBarViewMac(AutocompleteTextField* field, | 30 LocationBarViewMac(AutocompleteTextField* field, |
| 31 AutocompletePopupPositioner* positioner, |
30 CommandUpdater* command_updater, | 32 CommandUpdater* command_updater, |
31 ToolbarModel* toolbar_model, | 33 ToolbarModel* toolbar_model, |
32 Profile* profile); | 34 Profile* profile); |
33 virtual ~LocationBarViewMac(); | 35 virtual ~LocationBarViewMac(); |
34 | 36 |
35 // Overridden from LocationBar: | 37 // Overridden from LocationBar: |
36 virtual void ShowFirstRunBubble(bool use_OEM_bubble) { NOTIMPLEMENTED(); } | 38 virtual void ShowFirstRunBubble(bool use_OEM_bubble) { NOTIMPLEMENTED(); } |
37 virtual std::wstring GetInputString() const; | 39 virtual std::wstring GetInputString() const; |
38 virtual WindowOpenDisposition GetWindowOpenDisposition() const; | 40 virtual WindowOpenDisposition GetWindowOpenDisposition() const; |
39 virtual PageTransition::Type GetPageTransition() const; | 41 virtual PageTransition::Type GetPageTransition() const; |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 // Image used in drawing keyword hint. | 101 // Image used in drawing keyword hint. |
100 scoped_nsobject<NSImage> tab_button_image_; | 102 scoped_nsobject<NSImage> tab_button_image_; |
101 | 103 |
102 // The transition type to use for the navigation. | 104 // The transition type to use for the navigation. |
103 PageTransition::Type transition_; | 105 PageTransition::Type transition_; |
104 | 106 |
105 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); | 107 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); |
106 }; | 108 }; |
107 | 109 |
108 #endif // CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_ | 110 #endif // CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_ |
OLD | NEW |