Chromium Code Reviews| Index: chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.h |
| diff --git a/chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.h b/chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.h |
| index 02ff9cf3370c6fbcec5c9f35a87ce08aa5fb5b99..44a258631d41a564ca98d2bed78c94bd77dfeeeb 100644 |
| --- a/chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.h |
| +++ b/chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.h |
| @@ -7,6 +7,7 @@ |
| #include "base/mac/scoped_nsobject.h" |
| #include "base/memory/scoped_ptr.h" |
| +#include "chrome/browser/ui/autofill/autofill_dialog_models.h" |
| #include "chrome/browser/ui/autofill/card_unmask_prompt_view.h" |
| #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" |
| @@ -32,11 +33,12 @@ class CardUnmaskPromptViewBridge : public CardUnmaskPromptView, |
| // ConstrainedWindowMacDelegate implementation: |
| void OnConstrainedWindowClosed(ConstrainedWindowMac* window) override; |
| + CardUnmaskPromptController* GetController(); |
| void PerformClose(); |
| private: |
| scoped_ptr<ConstrainedWindowMac> constrained_window_; |
| - base::scoped_nsobject<CardUnmaskPromptViewCocoa> sheet_controller_; |
| + base::scoped_nsobject<CardUnmaskPromptViewCocoa> view_controller_; |
| // The controller |this| queries for logic and state. |
| CardUnmaskPromptController* controller_; |
| @@ -44,12 +46,15 @@ class CardUnmaskPromptViewBridge : public CardUnmaskPromptView, |
| } // autofill |
| -@interface CardUnmaskPromptViewCocoa : NSWindowController<NSWindowDelegate> { |
| +@interface CardUnmaskPromptViewCocoa : NSViewController<NSWindowDelegate> { |
|
groby-ooo-7-16
2015/02/18 19:01:18
Why is this a view controller now?
bondd
2015/02/26 01:25:08
You had previously suggested (over IM) that I shou
groby-ooo-7-16
2015/02/28 00:49:16
Ah, my apologies. In general, if reality conflicts
|
| @private |
| content::WebContents* webContents_; |
| // Owns |self|. |
| autofill::CardUnmaskPromptViewBridge* bridge_; |
| + |
| + autofill::MonthComboboxModel month_combobox_model_; |
|
groby-ooo-7-16
2015/02/18 19:01:18
Why are these members? Do they need to persist ag
bondd
2015/02/26 01:25:08
Done.
|
| + autofill::YearComboboxModel year_combobox_model_; |
| } |
| // Designated initializer. |webContents| and |bridge| must not be NULL. |