| Index: chrome/browser/ui/browser_instant_controller.cc
|
| diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc
|
| index 461179ed9bdea199a25f349fa92805618b747489..fd0c9b9b24cee09f1256d13c592bd63abcb74edf 100644
|
| --- a/chrome/browser/ui/browser_instant_controller.cc
|
| +++ b/chrome/browser/ui/browser_instant_controller.cc
|
| @@ -77,21 +77,16 @@ bool BrowserInstantController::OpenInstant(WindowOpenDisposition disposition) {
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // BrowserInstantController, InstantControllerDelegate implementation:
|
|
|
| -void BrowserInstantController::ShowInstant() {
|
| +void BrowserInstantController::ShowInstant(int height, InstantSizeUnits units) {
|
| // Call ShowInstant() first, before WasShown(), so that the preview is added
|
| // to the window hierarchy before it's painted. http://crbug.com/145568
|
| TabContents* preview = instant_->GetPreviewContents();
|
| - browser_->window()->ShowInstant(preview);
|
| + browser_->window()->ShowInstant(preview, height, units);
|
|
|
| // TODO(beng): Investigate if we can avoid this and instead rely on the
|
| // visibility of the WebContentsView.
|
| preview->web_contents()->WasShown();
|
| chrome::GetActiveWebContents(browser_)->WasHidden();
|
| -
|
| - content::NotificationService::current()->Notify(
|
| - chrome::NOTIFICATION_INSTANT_CONTROLLER_SHOWN,
|
| - content::Source<InstantController>(instant()),
|
| - content::NotificationService::NoDetails());
|
| }
|
|
|
| void BrowserInstantController::HideInstant() {
|
| @@ -101,11 +96,6 @@ void BrowserInstantController::HideInstant() {
|
| chrome::GetActiveWebContents(browser_)->WasShown();
|
| if (TabContents* preview = instant_->GetPreviewContents())
|
| preview->web_contents()->WasHidden();
|
| -
|
| - content::NotificationService::current()->Notify(
|
| - chrome::NOTIFICATION_INSTANT_CONTROLLER_HIDDEN,
|
| - content::Source<InstantController>(instant()),
|
| - content::NotificationService::NoDetails());
|
| }
|
|
|
| void BrowserInstantController::CommitInstant(TabContents* preview) {
|
|
|