| Index: chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
|
| index 54f2dda745aa3c1343cf95069d788dc4bb97b01b..9d5e337a329da9892bb2cc428f4ed34df1b02e2e 100644
|
| --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
|
| @@ -35,6 +35,7 @@
|
| #import "chrome/browser/ui/cocoa/image_button_cell.h"
|
| #import "chrome/browser/ui/cocoa/new_tab_button.h"
|
| #import "chrome/browser/ui/cocoa/tab_contents/favicon_util.h"
|
| +#import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
|
| #import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
|
| #import "chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.h"
|
| #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h"
|
| @@ -1159,8 +1160,8 @@ private:
|
| // Make a new tab. Load the contents of this tab from the nib and associate
|
| // the new controller with |contents| so it can be looked up later.
|
| scoped_nsobject<TabContentsController> contentsController(
|
| - [[TabContentsController alloc] initWithContents:contents->web_contents()
|
| - delegate:self]);
|
| + [[TabContentsController alloc]
|
| + initWithContents:contents->web_contents()]);
|
| [tabContentsArray_ insertObject:contentsController atIndex:index];
|
|
|
| // Make a new tab and add it to the strip. Keep track of its controller.
|
| @@ -1278,8 +1279,7 @@ private:
|
| // will follow, at which point we will install the new view.
|
| scoped_nsobject<TabContentsController> newController(
|
| [[TabContentsController alloc]
|
| - initWithContents:newContents->web_contents()
|
| - delegate:self]);
|
| + initWithContents:newContents->web_contents()]);
|
|
|
| // Bye bye, |oldController|.
|
| [tabContentsArray_ replaceObjectAtIndex:index withObject:newController];
|
| @@ -2048,14 +2048,6 @@ private:
|
| sheetController_.reset();
|
| }
|
|
|
| -// TabContentsControllerDelegate protocol.
|
| -- (void)tabContentsViewFrameWillChange:(TabContentsController*)source
|
| - frameRect:(NSRect)frameRect {
|
| - id<TabContentsControllerDelegate> controller =
|
| - [[switchView_ window] windowController];
|
| - [controller tabContentsViewFrameWillChange:source frameRect:frameRect];
|
| -}
|
| -
|
| - (TabContentsController*)activeTabContentsController {
|
| int modelIndex = tabStripModel_->active_index();
|
| if (modelIndex < 0)
|
|
|