Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1563)

Unified Diff: chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.h

Issue 1099403005: [AiS] changing mac omnibox suggestions form NSMatrix to NSTableView (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review changes and rounding error fix Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.h
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.h b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.h
index 2ce61674c6b3890e773de072237ebebe06a5aae6..b8c7d494af4b8e3806e0d639eb20588ed071a06b 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.h
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.h
@@ -10,6 +10,26 @@
#import "ui/base/cocoa/tracking_area.h"
#include "ui/base/window_open_disposition.h"
+@class OmniboxPopupCell;
+
+@interface OmniboxPopupTableController
+ : NSViewController<NSTableViewDelegate, NSTableViewDataSource> {
+ @private
+ base::scoped_nsobject<NSArray> array_;
+ NSInteger hovered_index_;
+};
+
+// Set the hovered highlight.
+- (void)highlightRowAt:(NSInteger)rowIndex withView:(NSView*)view;
+
+// Which row has the hovered highlight.
+- (NSInteger)highlightedRow;
+
+// Get the drawing rectangle for the given row.
+- (NSRect)rectForRow:(NSInteger)rowIndex;
+
+@end
+
@class OmniboxPopupMatrix;
class OmniboxPopupMatrixDelegate {
@@ -27,20 +47,28 @@ class OmniboxPopupMatrixDelegate {
// Sets up a tracking area to implement hover by highlighting the cell the mouse
// is over.
-@interface OmniboxPopupMatrix : NSMatrix {
+@interface OmniboxPopupMatrix : NSTableView {
OmniboxPopupMatrixDelegate* delegate_; // weak
ui::ScopedCrTrackingArea trackingArea_;
+ base::scoped_nsobject<OmniboxPopupTableController> controller_;
}
// Create a zero-size matrix.
- (id)initWithDelegate:(OmniboxPopupMatrixDelegate*)delegate;
-// Sets the delegate.
-- (void)setDelegate:(OmniboxPopupMatrixDelegate*)delegate;
+// Sets the OmniboxPopupMatrixDelegate which is not the same as the NSTableView
+// delegate.
+- (void)setTheDelegate:(OmniboxPopupMatrixDelegate*)delegate;
// Return the currently highlighted row. Returns -1 if no row is highlighted.
- (NSInteger)highlightedRow;
+// Select the row by turning it on. Turns off prior selection.
Scott Hess - ex-Googler 2015/05/07 22:35:42 IMHO, using on and off are themselves weird, they'
dschuyler 2015/05/13 01:41:11 Done.
+- (void)selectRowAt:(NSInteger)rowIndex;
+
+// Setup the information used by the NSTableView data source.
+- (void)setDataArray:(NSArray*)array;
+
@end
#endif // CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_POPUP_MATRIX_H_

Powered by Google App Engine
This is Rietveld 408576698