chrome/browser/ui/gtk/location_bar_view_gtk.cc - Issue 10959054: Switch ZoomTabHelper to use WebContentsUserData.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/gtk/location_bar_view_gtk.cc

Issue 10959054: Switch ZoomTabHelper to use WebContentsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 3 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:

Index: chrome/browser/ui/gtk/location_bar_view_gtk.cc

diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc

index b86f9eb7b3e33b8e04886fd04e89b5eeaa27d8fc..5f355e2da2625992c5d4f194aeee4e1a1fda1488 100644

--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc

+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc

@@ -1571,7 +1571,8 @@ void LocationBarViewGtk::UpdateZoomIcon() {

if (!zoom_.get() || !tab_contents)

return;

- ZoomController* zoom_controller = tab_contents->zoom_controller();

+ ZoomController* zoom_controller =

+ ZoomController::FromWebContents(tab_contents->web_contents());

if (!zoom_controller || zoom_controller->IsAtDefaultZoom() ||

toolbar_model_->input_in_progress()) {

gtk_widget_hide(zoom_.get());