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_bubble_view.h" | 5 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" |
6 | 6 |
7 #include "base/i18n/rtl.h" | 7 #include "base/i18n/rtl.h" |
8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
9 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
10 #include "chrome/browser/chrome_page_zoom.h" | |
11 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
12 #include "chrome/browser/ui/browser_finder.h" | 11 #include "chrome/browser/ui/browser_finder.h" |
13 #include "chrome/browser/ui/browser_tabstrip.h" | 12 #include "chrome/browser/ui/browser_tabstrip.h" |
14 #include "chrome/browser/ui/browser_window.h" | 13 #include "chrome/browser/ui/browser_window.h" |
15 #include "chrome/browser/ui/views/frame/browser_view.h" | 14 #include "chrome/browser/ui/views/frame/browser_view.h" |
16 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 15 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
17 #include "chrome/browser/ui/views/location_bar/zoom_view.h" | 16 #include "chrome/browser/ui/views/location_bar/zoom_view.h" |
18 #include "chrome/common/extensions/api/extension_action/action_info.h" | 17 #include "chrome/common/extensions/api/extension_action/action_info.h" |
19 #include "chrome/grit/generated_resources.h" | 18 #include "chrome/grit/generated_resources.h" |
| 19 #include "components/ui/zoom/page_zoom.h" |
20 #include "components/ui/zoom/zoom_controller.h" | 20 #include "components/ui/zoom/zoom_controller.h" |
21 #include "content/public/browser/notification_source.h" | 21 #include "content/public/browser/notification_source.h" |
22 #include "extensions/browser/extension_zoom_request_client.h" | 22 #include "extensions/browser/extension_zoom_request_client.h" |
23 #include "extensions/common/manifest_handlers/icons_handler.h" | 23 #include "extensions/common/manifest_handlers/icons_handler.h" |
24 #include "grit/theme_resources.h" | 24 #include "grit/theme_resources.h" |
25 #include "ui/base/l10n/l10n_util.h" | 25 #include "ui/base/l10n/l10n_util.h" |
26 #include "ui/base/resource/resource_bundle.h" | 26 #include "ui/base/resource/resource_bundle.h" |
27 #include "ui/gfx/favicon_size.h" | 27 #include "ui/gfx/favicon_size.h" |
28 #include "ui/views/controls/button/image_button.h" | 28 #include "ui/views/controls/button/image_button.h" |
29 #include "ui/views/controls/button/label_button.h" | 29 #include "ui/views/controls/button/label_button.h" |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 void ZoomBubbleView::ButtonPressed(views::Button* sender, | 228 void ZoomBubbleView::ButtonPressed(views::Button* sender, |
229 const ui::Event& event) { | 229 const ui::Event& event) { |
230 if (sender == image_button_) { | 230 if (sender == image_button_) { |
231 DCHECK(extension_info_.icon_image) << "Invalid button press."; | 231 DCHECK(extension_info_.icon_image) << "Invalid button press."; |
232 Browser* browser = chrome::FindBrowserWithWebContents(web_contents_); | 232 Browser* browser = chrome::FindBrowserWithWebContents(web_contents_); |
233 chrome::AddSelectedTabWithURL( | 233 chrome::AddSelectedTabWithURL( |
234 browser, GURL(base::StringPrintf("chrome://extensions?id=%s", | 234 browser, GURL(base::StringPrintf("chrome://extensions?id=%s", |
235 extension_info_.id.c_str())), | 235 extension_info_.id.c_str())), |
236 ui::PAGE_TRANSITION_FROM_API); | 236 ui::PAGE_TRANSITION_FROM_API); |
237 } else { | 237 } else { |
238 chrome_page_zoom::Zoom(web_contents_, content::PAGE_ZOOM_RESET); | 238 ui_zoom::PageZoom::Zoom(web_contents_, content::PAGE_ZOOM_RESET); |
239 } | 239 } |
240 } | 240 } |
241 | 241 |
242 void ZoomBubbleView::OnImmersiveRevealStarted() { | 242 void ZoomBubbleView::OnImmersiveRevealStarted() { |
243 CloseBubble(); | 243 CloseBubble(); |
244 } | 244 } |
245 | 245 |
246 void ZoomBubbleView::OnImmersiveModeControllerDestroyed() { | 246 void ZoomBubbleView::OnImmersiveModeControllerDestroyed() { |
247 immersive_mode_controller_ = NULL; | 247 immersive_mode_controller_ = NULL; |
248 } | 248 } |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
324 } | 324 } |
325 } | 325 } |
326 | 326 |
327 void ZoomBubbleView::StopTimer() { | 327 void ZoomBubbleView::StopTimer() { |
328 timer_.Stop(); | 328 timer_.Stop(); |
329 } | 329 } |
330 | 330 |
331 ZoomBubbleView::ZoomBubbleExtensionInfo::ZoomBubbleExtensionInfo() {} | 331 ZoomBubbleView::ZoomBubbleExtensionInfo::ZoomBubbleExtensionInfo() {} |
332 | 332 |
333 ZoomBubbleView::ZoomBubbleExtensionInfo::~ZoomBubbleExtensionInfo() {} | 333 ZoomBubbleView::ZoomBubbleExtensionInfo::~ZoomBubbleExtensionInfo() {} |
OLD | NEW |