| 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" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 // NSTableView. | 24 // NSTableView. |
| 25 class OmniboxPopupViewMac : public OmniboxPopupView, | 25 class OmniboxPopupViewMac : public OmniboxPopupView, |
| 26 public OmniboxPopupMatrixDelegate { | 26 public OmniboxPopupMatrixDelegate { |
| 27 public: | 27 public: |
| 28 OmniboxPopupViewMac(OmniboxView* omnibox_view, | 28 OmniboxPopupViewMac(OmniboxView* omnibox_view, |
| 29 OmniboxEditModel* edit_model, | 29 OmniboxEditModel* edit_model, |
| 30 NSTextField* field); | 30 NSTextField* field); |
| 31 virtual ~OmniboxPopupViewMac(); | 31 virtual ~OmniboxPopupViewMac(); |
| 32 | 32 |
| 33 // Overridden from OmniboxPopupView: | 33 // Overridden from OmniboxPopupView: |
| 34 virtual bool IsOpen() const OVERRIDE; | 34 virtual bool IsOpen() const override; |
| 35 virtual void InvalidateLine(size_t line) OVERRIDE {} | 35 virtual void InvalidateLine(size_t line) override {} |
| 36 virtual void UpdatePopupAppearance() OVERRIDE; | 36 virtual void UpdatePopupAppearance() override; |
| 37 virtual gfx::Rect GetTargetBounds() OVERRIDE; | 37 virtual gfx::Rect GetTargetBounds() override; |
| 38 // This is only called by model in SetSelectedLine() after updating | 38 // This is only called by model in SetSelectedLine() after updating |
| 39 // everything. Popup should already be visible. | 39 // everything. Popup should already be visible. |
| 40 virtual void PaintUpdatesNow() OVERRIDE; | 40 virtual void PaintUpdatesNow() override; |
| 41 virtual void OnDragCanceled() OVERRIDE {} | 41 virtual void OnDragCanceled() override {} |
| 42 | 42 |
| 43 // Overridden from OmniboxPopupMatrixDelegate: | 43 // Overridden from OmniboxPopupMatrixDelegate: |
| 44 virtual void OnMatrixRowSelected(OmniboxPopupMatrix* matrix, | 44 virtual void OnMatrixRowSelected(OmniboxPopupMatrix* matrix, |
| 45 size_t row) OVERRIDE; | 45 size_t row) override; |
| 46 virtual void OnMatrixRowClicked(OmniboxPopupMatrix* matrix, | 46 virtual void OnMatrixRowClicked(OmniboxPopupMatrix* matrix, |
| 47 size_t row) OVERRIDE; | 47 size_t row) override; |
| 48 virtual void OnMatrixRowMiddleClicked(OmniboxPopupMatrix* matrix, | 48 virtual void OnMatrixRowMiddleClicked(OmniboxPopupMatrix* matrix, |
| 49 size_t row) OVERRIDE; | 49 size_t row) override; |
| 50 | 50 |
| 51 OmniboxPopupMatrix* matrix() { return matrix_; } | 51 OmniboxPopupMatrix* matrix() { return matrix_; } |
| 52 | 52 |
| 53 protected: | 53 protected: |
| 54 // Gets the autocomplete results. This is virtual so that it can be overriden | 54 // Gets the autocomplete results. This is virtual so that it can be overriden |
| 55 // by tests. | 55 // by tests. |
| 56 virtual const AutocompleteResult& GetResult() const; | 56 virtual const AutocompleteResult& GetResult() const; |
| 57 | 57 |
| 58 private: | 58 private: |
| 59 // Create the popup_ instance if needed. | 59 // Create the popup_ instance if needed. |
| (...skipping 23 matching lines...) Expand all Loading... |
| 83 | 83 |
| 84 base::scoped_nsobject<OmniboxPopupMatrix> matrix_; | 84 base::scoped_nsobject<OmniboxPopupMatrix> matrix_; |
| 85 base::scoped_nsobject<NSView> top_separator_view_; | 85 base::scoped_nsobject<NSView> top_separator_view_; |
| 86 base::scoped_nsobject<NSView> bottom_separator_view_; | 86 base::scoped_nsobject<NSView> bottom_separator_view_; |
| 87 base::scoped_nsobject<NSBox> background_view_; | 87 base::scoped_nsobject<NSBox> background_view_; |
| 88 | 88 |
| 89 DISALLOW_COPY_AND_ASSIGN(OmniboxPopupViewMac); | 89 DISALLOW_COPY_AND_ASSIGN(OmniboxPopupViewMac); |
| 90 }; | 90 }; |
| 91 | 91 |
| 92 #endif // CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_POPUP_VIEW_MAC_H_ | 92 #endif // CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_POPUP_VIEW_MAC_H_ |
| OLD | NEW |