chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm - 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/cocoa/location_bar/location_bar_view_mac.mm

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/cocoa/location_bar/location_bar_view_mac.mm

diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

index 98daf80f156261fa013e3c07cb840433d1b54f8a..be6d7f15e628417447db5373b5f6da3c24d04c4f 100644

--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

@@ -54,6 +54,7 @@

#include "chrome/browser/ui/omnibox/location_bar_util.h"

#import "chrome/browser/ui/omnibox/omnibox_popup_model.h"

#include "chrome/browser/ui/tab_contents/tab_contents.h"

+#include "chrome/browser/ui/zoom/zoom_controller.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/extensions/extension.h"

@@ -766,7 +767,9 @@ void LocationBarViewMac::UpdateZoomDecoration() {

if (!tab_contents)

return;

- zoom_decoration_->Update(tab_contents->zoom_controller());

+ ZoomController* zoom_controller =

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

+ zoom_decoration_->Update(zoom_controller);

}

void LocationBarViewMac::UpdateStarDecorationVisibility() {