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

Side by Side 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h" 5 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h"
6 6
7 #include "base/string16.h" 7 #include "base/string16.h"
8 #include "base/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" 10 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
11 #import "chrome/browser/ui/cocoa/view_id_util.h"
11 #include "chrome/browser/ui/toolbar/toolbar_model.h" 12 #include "chrome/browser/ui/toolbar/toolbar_model.h"
12 #include "chrome/browser/ui/zoom/zoom_controller.h" 13 #include "chrome/browser/ui/zoom/zoom_controller.h"
13 #include "grit/generated_resources.h" 14 #include "grit/generated_resources.h"
14 #include "ui/base/l10n/l10n_util_mac.h" 15 #include "ui/base/l10n/l10n_util_mac.h"
15 16
16 ZoomDecoration::ZoomDecoration(ToolbarModel* toolbar_model) 17 ZoomDecoration::ZoomDecoration(ToolbarModel* toolbar_model)
17 : toolbar_model_(toolbar_model) { 18 : toolbar_model_(toolbar_model) {
18 Update(NULL); 19 Update(NULL);
19 } 20 }
20 21
21 ZoomDecoration::~ZoomDecoration() { 22 ZoomDecoration::~ZoomDecoration() {
22 } 23 }
23 24
24 void ZoomDecoration::Update(ZoomController* zoom_controller) { 25 void ZoomDecoration::Update(ZoomController* zoom_controller) {
25 if (!zoom_controller || zoom_controller->IsAtDefaultZoom() || 26 if (!zoom_controller || zoom_controller->IsAtDefaultZoom() ||
26 toolbar_model_->input_in_progress()) { 27 toolbar_model_->input_in_progress()) {
27 // TODO(dbeam): hide zoom bubble when it exists. 28 // TODO(dbeam): hide zoom bubble when it exists.
28 SetVisible(false); 29 SetVisible(false);
29 return; 30 return;
30 } 31 }
31 32
32 SetImage(OmniboxViewMac::ImageForResource( 33 SetImage(OmniboxViewMac::ImageForResource(
33 zoom_controller->GetResourceForZoomLevel())); 34 zoom_controller->GetResourceForZoomLevel()));
35 view_id_util::SetID(GetImage(), VIEW_ID_ZOOM_BUTTON);
34 36
35 string16 zoom_percent = base::IntToString16(zoom_controller->zoom_percent()); 37 string16 zoom_percent = base::IntToString16(zoom_controller->zoom_percent());
36 NSString* zoom_string = 38 NSString* zoom_string =
37 l10n_util::GetNSStringFWithFixup(IDS_TOOLTIP_ZOOM, zoom_percent); 39 l10n_util::GetNSStringFWithFixup(IDS_TOOLTIP_ZOOM, zoom_percent);
38 tooltip_.reset([zoom_string retain]); 40 tooltip_.reset([zoom_string retain]);
39 41
40 SetVisible(true); 42 SetVisible(true);
41 } 43 }
42 44
43 bool ZoomDecoration::AcceptsMousePress() { 45 bool ZoomDecoration::AcceptsMousePress() {
44 return true; 46 return true;
45 } 47 }
46 48
47 NSString* ZoomDecoration::GetToolTip() { 49 NSString* ZoomDecoration::GetToolTip() {
48 return tooltip_.get(); 50 return tooltip_.get();
49 } 51 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698