Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1023)

Unified Diff: chrome/browser/ui/views/location_bar/zoom_bubble_view.cc

Issue 836933005: Refactor fullscreen_controller. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync to TOT Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 416de500dd3f599b4f536dfc4640f1c836c4d796..eff898a1bef2102752560165754c5e2fecc44b6e 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,8 @@ 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->exclusive_access_manager()->fullscreen_controller());
BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
bool is_fullscreen = browser_view->IsFullscreen();
@@ -66,11 +67,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 +116,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),

Powered by Google App Engine
This is Rietveld 408576698