chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm - Issue 11040055: Adds a FakeToolbarModel for use in testing.

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/zoom_decoration.mm

Issue 11040055: Adds a FakeToolbarModel for use in testing. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: renamed methods and fixed usage Created 8 years, 2 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/zoom_decoration.mm

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

index d6dedc17a482fefc3851c42fa058faca44eae27c..6e0e4a0844fe26e1ed1c26a0d3bda355ad150dc8 100644

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

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

@@ -23,7 +23,7 @@ ZoomDecoration::~ZoomDecoration() {

void ZoomDecoration::Update(ZoomController* zoom_controller) {

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

- toolbar_model_->input_in_progress()) {

+ toolbar_model_->GetInputInProgress()) {

// TODO(dbeam): hide zoom bubble when it exists.

SetVisible(false);

return;