chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm - Issue 10985069: [test fixlet] Add tests for the zoom icon in the location bar on GTK.

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 10985069: [test fixlet] Add tests for the zoom icon in the location bar on GTK. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: mac fixes 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..8e2a98abc621a8ae38eb4cca17535cb92d6a97c3 100644

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

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

@@ -8,6 +8,7 @@

#include "base/string_number_conversions.h"

#include "chrome/app/chrome_command_ids.h"

#import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"

+#import "chrome/browser/ui/cocoa/view_id_util.h"

#include "chrome/browser/ui/toolbar/toolbar_model.h"

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

#include "grit/generated_resources.h"

@@ -31,6 +32,7 @@ void ZoomDecoration::Update(ZoomController* zoom_controller) {

SetImage(OmniboxViewMac::ImageForResource(

zoom_controller->GetResourceForZoomLevel()));

+ view_id_util::SetID(GetImage(), VIEW_ID_ZOOM_BUTTON);

string16 zoom_percent = base::IntToString16(zoom_controller->zoom_percent());

NSString* zoom_string =