| OLD | NEW | 
|---|
| 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 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 11 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 
| 12 #include "chrome/browser/ui/zoom/zoom_controller.h" | 12 #include "chrome/browser/ui/zoom/zoom_controller.h" | 
| 13 #include "grit/generated_resources.h" | 13 #include "grit/generated_resources.h" | 
| 14 #include "ui/base/l10n/l10n_util_mac.h" | 14 #include "ui/base/l10n/l10n_util_mac.h" | 
| 15 | 15 | 
| 16 ZoomDecoration::ZoomDecoration(ToolbarModel* toolbar_model) | 16 ZoomDecoration::ZoomDecoration(ToolbarModel* toolbar_model) | 
| 17     : toolbar_model_(toolbar_model) { | 17     : toolbar_model_(toolbar_model) { | 
| 18   Update(NULL); | 18   Update(NULL); | 
| 19 } | 19 } | 
| 20 | 20 | 
| 21 ZoomDecoration::~ZoomDecoration() { | 21 ZoomDecoration::~ZoomDecoration() { | 
| 22 } | 22 } | 
| 23 | 23 | 
| 24 void ZoomDecoration::Update(ZoomController* zoom_controller) { | 24 void ZoomDecoration::Update(ZoomController* zoom_controller) { | 
| 25   if (!zoom_controller || zoom_controller->IsAtDefaultZoom() || | 25   if (!zoom_controller || zoom_controller->IsAtDefaultZoom() || | 
| 26       toolbar_model_->input_in_progress()) { | 26       toolbar_model_->GetInputInProgress()) { | 
| 27     // TODO(dbeam): hide zoom bubble when it exists. | 27     // TODO(dbeam): hide zoom bubble when it exists. | 
| 28     SetVisible(false); | 28     SetVisible(false); | 
| 29     return; | 29     return; | 
| 30   } | 30   } | 
| 31 | 31 | 
| 32   SetImage(OmniboxViewMac::ImageForResource( | 32   SetImage(OmniboxViewMac::ImageForResource( | 
| 33       zoom_controller->GetResourceForZoomLevel())); | 33       zoom_controller->GetResourceForZoomLevel())); | 
| 34 | 34 | 
| 35   string16 zoom_percent = base::IntToString16(zoom_controller->zoom_percent()); | 35   string16 zoom_percent = base::IntToString16(zoom_controller->zoom_percent()); | 
| 36   NSString* zoom_string = | 36   NSString* zoom_string = | 
| 37       l10n_util::GetNSStringFWithFixup(IDS_TOOLTIP_ZOOM, zoom_percent); | 37       l10n_util::GetNSStringFWithFixup(IDS_TOOLTIP_ZOOM, zoom_percent); | 
| 38   tooltip_.reset([zoom_string retain]); | 38   tooltip_.reset([zoom_string retain]); | 
| 39 | 39 | 
| 40   SetVisible(true); | 40   SetVisible(true); | 
| 41 } | 41 } | 
| 42 | 42 | 
| 43 bool ZoomDecoration::AcceptsMousePress() { | 43 bool ZoomDecoration::AcceptsMousePress() { | 
| 44   return true; | 44   return true; | 
| 45 } | 45 } | 
| 46 | 46 | 
| 47 NSString* ZoomDecoration::GetToolTip() { | 47 NSString* ZoomDecoration::GetToolTip() { | 
| 48   return tooltip_.get(); | 48   return tooltip_.get(); | 
| 49 } | 49 } | 
| OLD | NEW | 
|---|