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 #include "chrome/browser/ui/views/location_bar/zoom_view.h" | 5 #include "chrome/browser/ui/views/location_bar/zoom_view.h" |
6 | 6 |
7 #include "chrome/browser/ui/views/browser_dialogs.h" | 7 #include "chrome/browser/ui/views/browser_dialogs.h" |
8 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" | 8 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" |
9 #include "chrome/browser/ui/view_ids.h" | 9 #include "chrome/browser/ui/view_ids.h" |
10 #include "grit/generated_resources.h" | 10 #include "grit/generated_resources.h" |
11 #include "grit/theme_resources.h" | 11 #include "grit/theme_resources.h" |
12 #include "ui/base/accessibility/accessible_view_state.h" | 12 #include "ui/base/accessibility/accessible_view_state.h" |
13 #include "ui/base/l10n/l10n_util.h" | 13 #include "ui/base/l10n/l10n_util.h" |
14 #include "ui/base/resource/resource_bundle.h" | 14 #include "ui/base/resource/resource_bundle.h" |
15 #include "ui/gfx/size.h" | 15 #include "ui/gfx/size.h" |
16 | 16 |
17 ZoomView::ZoomView(ToolbarModel* toolbar_model) | 17 ZoomView::ZoomView(ToolbarModel* toolbar_model, |
| 18 LocationBarView::Delegate* location_bar_delegate) |
18 : toolbar_model_(toolbar_model), | 19 : toolbar_model_(toolbar_model), |
| 20 location_bar_delegate_(location_bar_delegate), |
19 zoom_icon_state_(ZoomController::NONE), | 21 zoom_icon_state_(ZoomController::NONE), |
20 zoom_percent_(100) { | 22 zoom_percent_(100) { |
21 set_accessibility_focusable(true); | 23 set_accessibility_focusable(true); |
22 } | 24 } |
23 | 25 |
24 ZoomView::~ZoomView() { | 26 ZoomView::~ZoomView() { |
25 } | 27 } |
26 | 28 |
27 void ZoomView::SetZoomIconState(ZoomController::ZoomIconState zoom_icon_state) { | 29 void ZoomView::SetZoomIconState(ZoomController::ZoomIconState zoom_icon_state) { |
28 if (zoom_icon_state == zoom_icon_state_) | 30 if (zoom_icon_state == zoom_icon_state_) |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 // Don't show tooltip if the zoom bubble is displayed. | 66 // Don't show tooltip if the zoom bubble is displayed. |
65 return !ZoomBubbleView::IsShowing() && ImageView::GetTooltipText(p, tooltip); | 67 return !ZoomBubbleView::IsShowing() && ImageView::GetTooltipText(p, tooltip); |
66 } | 68 } |
67 | 69 |
68 bool ZoomView::OnMousePressed(const views::MouseEvent& event) { | 70 bool ZoomView::OnMousePressed(const views::MouseEvent& event) { |
69 // Do nothing until mouse is released. | 71 // Do nothing until mouse is released. |
70 return true; | 72 return true; |
71 } | 73 } |
72 | 74 |
73 void ZoomView::OnMouseReleased(const views::MouseEvent& event) { | 75 void ZoomView::OnMouseReleased(const views::MouseEvent& event) { |
74 if (event.IsOnlyLeftMouseButton() && HitTest(event.location())) | 76 if (event.IsOnlyLeftMouseButton() && HitTest(event.location())) { |
75 ZoomBubbleView::ShowBubble(this, zoom_percent_, false); | 77 ZoomBubbleView::ShowBubble( |
| 78 this, location_bar_delegate_->GetTabContents(), false); |
| 79 } |
76 } | 80 } |
77 | 81 |
78 bool ZoomView::OnKeyPressed(const views::KeyEvent& event) { | 82 bool ZoomView::OnKeyPressed(const views::KeyEvent& event) { |
79 if (event.key_code() != ui::VKEY_SPACE && | 83 if (event.key_code() != ui::VKEY_SPACE && |
80 event.key_code() != ui::VKEY_RETURN) | 84 event.key_code() != ui::VKEY_RETURN) |
81 return false; | 85 return false; |
82 | 86 |
83 ZoomBubbleView::ShowBubble(this, zoom_percent_, false); | 87 ZoomBubbleView::ShowBubble( |
| 88 this, location_bar_delegate_->GetTabContents(), false); |
84 return true; | 89 return true; |
85 } | 90 } |
OLD | NEW |