| Index: chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h
|
| diff --git a/chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h b/chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h
|
| index 09119f4a976055835435fa7fcd6b94c2a92298b5..db19ab26e655adf9421b8e52b1cde7d9647b493e 100644
|
| --- a/chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h
|
| +++ b/chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h
|
| @@ -9,18 +9,20 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| +#include "base/mac/scoped_nsobject.h"
|
| #include "chrome/browser/ui/autofill/autofill_popup_view.h"
|
| +#include "chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.h"
|
|
|
| @class AutofillPopupViewCocoa;
|
| @class NSWindow;
|
|
|
| namespace autofill {
|
|
|
| -class AutofillPopupController;
|
| +class AutofillPopupViewDelegate;
|
|
|
| -// Mac implementation for AutofillPopupView interface.
|
| -// Serves as a bridge to the Objective-C class AutofillPopupViewCocoa which
|
| -// actually implements the view.
|
| +// Mac implementation of the AutofillPopupView interface.
|
| +// Serves as a bridge to an instance of the Objective-C class which actually
|
| +// implements the view.
|
| class AutofillPopupViewBridge : public AutofillPopupView {
|
| public:
|
| explicit AutofillPopupViewBridge(AutofillPopupController* controller);
|
| @@ -34,16 +36,13 @@ class AutofillPopupViewBridge : public AutofillPopupView {
|
| virtual void InvalidateRow(size_t row) OVERRIDE;
|
| virtual void UpdateBoundsAndRedrawPopup() OVERRIDE;
|
|
|
| - // Set the initial bounds of the popup to show, including the placement
|
| - // of it.
|
| + // Set the initial bounds of the popup, including its placement.
|
| void SetInitialBounds();
|
|
|
| - // The controller for this view.
|
| - AutofillPopupController* controller_; // Weak reference.
|
| + // The native Cocoa view.
|
| + base::scoped_nsobject<AutofillPopupViewCocoa> view_;
|
|
|
| - // The native Cocoa window and view.
|
| - NSWindow* window_; // Weak reference, owns itself.
|
| - AutofillPopupViewCocoa* view_; // Weak reference, owned by the |window_|.
|
| + AutofillPopupController* controller_; // Weak.
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AutofillPopupViewBridge);
|
| };
|
|
|