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 #ifndef CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_POPUP_VIEW_MAC_H_ | 5 #ifndef CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_POPUP_VIEW_MAC_H_ |
6 #define CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_POPUP_VIEW_MAC_H_ | 6 #define CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_POPUP_VIEW_MAC_H_ |
7 | 7 |
8 #import <Cocoa/Cocoa.h> | 8 #import <Cocoa/Cocoa.h> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
11 #include "base/memory/scoped_nsobject.h" | 11 #include "base/mac/scoped_nsobject.h" |
12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
13 #include "chrome/browser/autocomplete/autocomplete_match.h" | 13 #include "chrome/browser/autocomplete/autocomplete_match.h" |
14 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" | 14 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" |
15 #include "ui/gfx/font.h" | 15 #include "ui/gfx/font.h" |
16 | 16 |
17 @class AutocompleteMatrix; | 17 @class AutocompleteMatrix; |
18 class OmniboxEditModel; | 18 class OmniboxEditModel; |
19 class OmniboxPopupModel; | 19 class OmniboxPopupModel; |
20 class OmniboxView; | 20 class OmniboxView; |
21 | 21 |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 // Returns the NSImage that should be used as an icon for the given match. | 119 // Returns the NSImage that should be used as an icon for the given match. |
120 NSImage* ImageForMatch(const AutocompleteMatch& match); | 120 NSImage* ImageForMatch(const AutocompleteMatch& match); |
121 | 121 |
122 // TODO(shess): |omnibox_view_| should already be accessible via | 122 // TODO(shess): |omnibox_view_| should already be accessible via |
123 // |field_|, or perhaps via |model_|. Consider refactoring. | 123 // |field_|, or perhaps via |model_|. Consider refactoring. |
124 OmniboxView* omnibox_view_; | 124 OmniboxView* omnibox_view_; |
125 scoped_ptr<OmniboxPopupModel> model_; | 125 scoped_ptr<OmniboxPopupModel> model_; |
126 NSTextField* field_; // owned by tab controller | 126 NSTextField* field_; // owned by tab controller |
127 | 127 |
128 // Child window containing a matrix which implements the popup. | 128 // Child window containing a matrix which implements the popup. |
129 scoped_nsobject<NSWindow> popup_; | 129 base::scoped_nsobject<NSWindow> popup_; |
130 NSRect targetPopupFrame_; | 130 NSRect targetPopupFrame_; |
131 | 131 |
132 scoped_nsobject<AutocompleteMatrix> autocomplete_matrix_; | 132 base::scoped_nsobject<AutocompleteMatrix> autocomplete_matrix_; |
133 | 133 |
134 DISALLOW_COPY_AND_ASSIGN(OmniboxPopupViewMac); | 134 DISALLOW_COPY_AND_ASSIGN(OmniboxPopupViewMac); |
135 }; | 135 }; |
136 | 136 |
137 #endif // CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_POPUP_VIEW_MAC_H_ | 137 #endif // CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_POPUP_VIEW_MAC_H_ |
OLD | NEW |