| Index: chrome/browser/ui/cocoa/web_intent_picker_cocoa.h
|
| diff --git a/chrome/browser/ui/cocoa/web_intent_picker_cocoa.h b/chrome/browser/ui/cocoa/web_intent_picker_cocoa.h
|
| index 1242a184791772eaea25c0390c57272b6ed86ca5..89b34eac8de830f290e53d5f25a105433b05a8d1 100644
|
| --- a/chrome/browser/ui/cocoa/web_intent_picker_cocoa.h
|
| +++ b/chrome/browser/ui/cocoa/web_intent_picker_cocoa.h
|
| @@ -17,7 +17,6 @@
|
|
|
| class ConstrainedWindow;
|
| class TabContents;
|
| -typedef TabContents TabContentsWrapper;
|
| @class WebIntentPickerSheetController;
|
| class WebIntentInlineDispositionDelegate;
|
|
|
| @@ -25,9 +24,9 @@ class WebIntentInlineDispositionDelegate;
|
| class WebIntentPickerCocoa : public WebIntentPicker,
|
| public WebIntentPickerModelObserver {
|
| public:
|
| - // |wrapper|, and |delegate| must not be NULL.
|
| + // |tab_contents| and |delegate| must not be NULL.
|
| // |browser| should only be NULL for testing purposes.
|
| - WebIntentPickerCocoa(TabContentsWrapper* wrapper,
|
| + WebIntentPickerCocoa(TabContents* tab_contents,
|
| WebIntentPickerDelegate* delegate,
|
| WebIntentPickerModel* model);
|
| virtual ~WebIntentPickerCocoa();
|
| @@ -68,13 +67,13 @@ class WebIntentPickerCocoa : public WebIntentPicker,
|
| // The picker model. Weak reference.
|
| WebIntentPickerModel* model_;
|
|
|
| - // Wrapper around the WebContents we're in. Weak Reference.
|
| - TabContentsWrapper* wrapper_;
|
| + // TabContents we're in. Weak Reference.
|
| + TabContents* tab_contents_;
|
|
|
| WebIntentPickerSheetController* sheet_controller_; // Weak reference.
|
|
|
| - // Tab contents wrapper to hold intent page if inline disposition is used.
|
| - scoped_ptr<TabContentsWrapper> inline_disposition_tab_contents_;
|
| + // TabContents to hold intent page if inline disposition is used.
|
| + scoped_ptr<TabContents> inline_disposition_tab_contents_;
|
|
|
| // Delegate for inline disposition tab contents.
|
| scoped_ptr<WebIntentInlineDispositionDelegate> inline_disposition_delegate_;
|
|
|