[AiS] changing mac omnibox suggestions form NSMatrix to NSTableView

chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_POPUP_VIEW_MAC_H_
 #define CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_POPUP_VIEW_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/basictypes.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h"
 #include "components/omnibox/autocomplete_match.h"
 #include "ui/gfx/font.h"
 
 class AutocompleteResult;
 class OmniboxEditModel;
 class OmniboxPopupModel;
 class OmniboxView;
 
 // Implements OmniboxPopupView using a raw NSWindow containing an
 // NSTableView.
 class OmniboxPopupViewMac : public OmniboxPopupView,
-                            public OmniboxPopupMatrixDelegate {
+                            public OmniboxPopupTableDelegate {
  public:
   OmniboxPopupViewMac(OmniboxView* omnibox_view,
                       OmniboxEditModel* edit_model,
                       NSTextField* field);
   ~OmniboxPopupViewMac() override;
 
   // Overridden from OmniboxPopupView:
   bool IsOpen() const override;
-  void InvalidateLine(size_t line) override {}
+  void InvalidateLine(size_t line) override;
   void UpdatePopupAppearance() override;
   gfx::Rect GetTargetBounds() override;
   // This is only called by model in SetSelectedLine() after updating
   // everything.  Popup should already be visible.
   void PaintUpdatesNow() override;
   void OnDragCanceled() override {}
 
-  // Overridden from OmniboxPopupMatrixDelegate:
-  void OnMatrixRowSelected(OmniboxPopupMatrix* matrix, size_t row) override;
-  void OnMatrixRowClicked(OmniboxPopupMatrix* matrix, size_t row) override;
-  void OnMatrixRowMiddleClicked(OmniboxPopupMatrix* matrix,
-                                size_t row) override;
-
-  OmniboxPopupMatrix* matrix() { return matrix_; }

[dschuyler, 2015/04/24 18:43:08]

This wasn't being used.

+  // Overridden from OmniboxPopupTableDelegate:
+  void OnTableRowSelected(OmniboxPopupTableView* table_view,
+                          size_t row) override;
+  void OnTableRowClicked(OmniboxPopupTableView* table_view,
+                         size_t row) override;
+  void OnTableRowMiddleClicked(OmniboxPopupTableView* table_view,
+                               size_t row) override;
 
  protected:
   // Gets the autocomplete results. This is virtual so that it can be overriden
   // by tests.
   virtual const AutocompleteResult& GetResult() const;
 
  private:
   // Create the popup_ instance if needed.
   void CreatePopupIfNeeded();
 
   // Calculate the appropriate position for the popup based on the
-  // field's screen position and the given target for the matrix
+  // field's screen position and the given target for the table view
   // height, and makes the popup visible.  Animates to the new frame
   // if the popup shrinks, snaps to the new frame if the popup grows,
   // allows existing animations to continue if the size doesn't
   // change.
-  void PositionPopup(const CGFloat matrixHeight);
+  void PositionPopup(const CGFloat tableHeight);
 
   // Returns the NSImage that should be used as an icon for the given match.
   NSImage* ImageForMatch(const AutocompleteMatch& match);
 
   // Opens the URL at the given row.
   void OpenURLForRow(size_t row, WindowOpenDisposition disposition);
 
   OmniboxView* omnibox_view_;
   scoped_ptr<OmniboxPopupModel> model_;
   NSTextField* field_;  // owned by tab controller
 
-  // Child window containing a matrix which implements the popup.
+  // Child window containing a table view which implements the popup.
   base::scoped_nsobject<NSWindow> popup_;
   NSRect target_popup_frame_;
 
-  base::scoped_nsobject<OmniboxPopupMatrix> matrix_;
+  base::scoped_nsobject<OmniboxPopupTableView> table_view_;
   base::scoped_nsobject<NSView> top_separator_view_;
   base::scoped_nsobject<NSView> bottom_separator_view_;
   base::scoped_nsobject<NSBox> background_view_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxPopupViewMac);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_POPUP_VIEW_MAC_H_