Implements a zoom icon in the Omnibox for Views.

chrome/browser/ui/views/location_bar/zoom_view.cc

Index: chrome/browser/ui/views/location_bar/zoom_view.cc
diff --git a/chrome/browser/ui/views/location_bar/zoom_view.cc b/chrome/browser/ui/views/location_bar/zoom_view.cc
new file mode 100644
index 0000000000000000000000000000000000000000..8be863fcc6ede025a140a1f78592b92f1f4b65ad
--- /dev/null
+++ b/chrome/browser/ui/views/location_bar/zoom_view.cc
@@ -0,0 +1,99 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/ui/views/location_bar/zoom_view.h"
+
+#include "chrome/browser/ui/views/browser_dialogs.h"
+#include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
+#include "chrome/browser/ui/view_ids.h"
+#include "grit/generated_resources.h"
+#include "grit/theme_resources_standard.h"
+#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/size.h"
+
+namespace {
+
+// The size (in pixels) of a side of the icon.
+const int kIconSideLength = 19;
+
+}
+
+ZoomView::ZoomView(ToolbarModel* toolbar_model)
+    : toolbar_model_(toolbar_model),
+      zoom_icon_state_(ZoomController::NONE),
+      zoom_percent_(100) {
+  set_accessibility_focusable(true);
+
+  gfx::Size size(kIconSideLength, kIconSideLength);
+  SetImageSize(size);

[Peter Kasting, 2012/06/26 23:23:39]

Nit: Is it possible to omit this, calculate it dynamically, etc.?

[Kyle Horimoto, 2012/06/30 00:22:50]

This cannot be ommitted because the image size must be set so that the location
bar has a proper width to allocate to the icon. There are two ways of going
about this: calling SetImageSize() as I did, or actually assigning an image to
the ImageView (in which case it will be calculated dynamically). That's what I
was doing before in the initializer list when I had initialized zoom_icon_state_
to ZoomController::ZOOM_PLUS_ICON. However, since you said that it was hacky to
do this when it should be set to ZoomController::NONE, there doesn't seem to be
a better way to do this.

[Peter Kasting, 2012/07/02 19:21:27]

I don't think this is true once you fix the comments in location_bar_view.cc,
because then the location bar won't check the size of the zoom view until it's
made visible via Update(), which will also set an image.

+}
+
+ZoomView::~ZoomView() {
+}
+
+void ZoomView::SetZoomIconState(ZoomController::ZoomIconState zoom_icon_state) {
+  if (zoom_icon_state == zoom_icon_state_)
+    return;
+
+  zoom_icon_state_ = zoom_icon_state;
+  Update();
+}
+
+void ZoomView::SetZoomIconTooltipPercent(int zoom_percent) {
+  if (zoom_percent == zoom_percent_)
+    return;
+
+  zoom_percent_ = zoom_percent;
+  Update();
+}
+
+void ZoomView::Update() {
+  if (toolbar_model_->input_in_progress() ||
+      zoom_icon_state_ == ZoomController::NONE) {
+    SetVisible(false);
+    ZoomBubbleView::CloseBubble();
+  } else {
+    SetVisible(true);
+    SetTooltipText(
+        l10n_util::GetStringFUTF16Int(IDS_TOOLTIP_ZOOM, zoom_percent_));
+    int resource_id = zoom_icon_state_ == ZoomController::ZOOM_PLUS_ICON ?

[Peter Kasting, 2012/06/26 23:23:39]

Nit: You could also inline this into the next statement

[Kyle Horimoto, 2012/06/30 00:22:50]

Done.

+        IDR_ZOOM_PLUS : IDR_ZOOM_MINUS;
+    SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+        resource_id));
+  }
+}
+
+void ZoomView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_ZOOM);
+  state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
+}
+
+bool ZoomView::GetTooltipText(const gfx::Point& p, string16* tooltip) const {
+  // Don't show tooltip if the zoom bubble is displayed.
+  if (ZoomBubbleView::IsShowing())

[Peter Kasting, 2012/06/26 23:23:39]

Nit: Shorter:

  return !ZoomBubbleView::IsShowing() && ImageView::GetTooltipText(p, tooltip);

[Kyle Horimoto, 2012/06/30 00:22:50]

Done.

+    return false;
+
+  return ImageView::GetTooltipText(p, tooltip);
+}
+
+bool ZoomView::OnMousePressed(const views::MouseEvent& event) {
+  // Do nothing until mouse is released.
+  return true;
+}
+
+void ZoomView::OnMouseReleased(const views::MouseEvent& event) {
+  if (event.IsOnlyLeftMouseButton() && HitTest(event.location()))
+    ZoomBubbleView::ShowBubble(this, zoom_percent_, false);
+}
+
+bool ZoomView::OnKeyPressed(const views::KeyEvent& event) {
+  if (event.key_code() != ui::VKEY_SPACE &&
+      event.key_code() != ui::VKEY_RETURN)
+    return false;
+
+  ZoomBubbleView::ShowBubble(this, zoom_percent_, false);
+  return true;
+}