| Index: chrome/browser/ui/views/location_bar/zoom_bubble_view.cc
|
| diff --git a/chrome/browser/ui/views/location_bar/zoom_bubble_view.cc b/chrome/browser/ui/views/location_bar/zoom_bubble_view.cc
|
| index 49db0318af1ad98662f04ec6ab0398c4d4793906..2e2e96587276f68042c7e93e10a256c09dbc7671 100644
|
| --- a/chrome/browser/ui/views/location_bar/zoom_bubble_view.cc
|
| +++ b/chrome/browser/ui/views/location_bar/zoom_bubble_view.cc
|
| @@ -39,7 +39,9 @@ ZoomBubbleView* ZoomBubbleView::zoom_bubble_ = NULL;
|
| void ZoomBubbleView::ShowBubble(content::WebContents* web_contents,
|
| bool auto_close) {
|
| Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
|
| - DCHECK(browser && browser->window() && browser->fullscreen_controller());
|
| + DCHECK(browser && browser->window() &&
|
| + browser->GetExclusiveAccessControllerManager()
|
| + ->GetFullscreenController());
|
|
|
| BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
|
| bool is_fullscreen = browser_view->IsFullscreen();
|
| @@ -66,11 +68,8 @@ void ZoomBubbleView::ShowBubble(content::WebContents* web_contents,
|
| // bubble must be closed and a new one created.
|
| CloseBubble();
|
|
|
| - zoom_bubble_ = new ZoomBubbleView(anchor_view,
|
| - web_contents,
|
| - auto_close,
|
| - browser_view->immersive_mode_controller(),
|
| - browser->fullscreen_controller());
|
| + zoom_bubble_ = new ZoomBubbleView(anchor_view, web_contents, auto_close,
|
| + browser_view->immersive_mode_controller());
|
|
|
| // If the zoom change was initiated by an extension, capture the relevent
|
| // information from it.
|
| @@ -118,8 +117,7 @@ ZoomBubbleView::ZoomBubbleView(
|
| views::View* anchor_view,
|
| content::WebContents* web_contents,
|
| bool auto_close,
|
| - ImmersiveModeController* immersive_mode_controller,
|
| - FullscreenController* fullscreen_controller)
|
| + ImmersiveModeController* immersive_mode_controller)
|
| : ManagedFullScreenBubbleDelegateView(anchor_view, web_contents),
|
| image_button_(NULL),
|
| label_(NULL),
|
|
|