| Index: chrome/browser/ui/browser.h
|
| diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
|
| index 5dac267aa171184e86e28f6bb189395073ba2e8e..f3a54837393d92a0c646db331b4154bfc3e65d1d 100644
|
| --- a/chrome/browser/ui/browser.h
|
| +++ b/chrome/browser/ui/browser.h
|
| @@ -678,8 +678,7 @@ class Browser : public TabStripModelObserver,
|
| bool starred) OVERRIDE;
|
|
|
| // Overridden from ZoomObserver:
|
| - virtual void OnZoomChanged(content::WebContents* source,
|
| - bool can_show_bubble) OVERRIDE;
|
| + virtual void OnZoomChanged(const OnZoomChangedEventData& data) OVERRIDE;
|
|
|
| // Overridden from SelectFileDialog::Listener:
|
| virtual void FileSelected(const base::FilePath& path,
|
| @@ -754,8 +753,10 @@ class Browser : public TabStripModelObserver,
|
| // Assorted utility functions ///////////////////////////////////////////////
|
|
|
| // Sets the specified browser as the delegate of the WebContents and all the
|
| - // associated tab helpers that are needed.
|
| - void SetAsDelegate(content::WebContents* web_contents, Browser* delegate);
|
| + // associated tab helpers that are needed. If |set_delegate| is true, this
|
| + // browser object is set as a delegate for |web_contents| components, else
|
| + // is is removed as a delegate.
|
| + void SetAsDelegate(content::WebContents* web_contents, bool set_delegate);
|
|
|
| // Shows the Find Bar, optionally selecting the next entry that matches the
|
| // existing search string for that Tab. |forward_direction| controls the
|
|
|