Zoom Extension API (chrome)

chrome/browser/ui/browser.cc

 // Copyright 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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // defined(OS_WIN)
@@ skipping 32 matching lines @@
 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
 #include "chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h"
 #include "chrome/browser/custom_handlers/register_protocol_handler_permission_request.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/devtools/devtools_toggle_action.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_shelf.h"
+#include "chrome/browser/extensions/api/tabs/tabs_event_router.h"
+#include "chrome/browser/extensions/api/tabs/tabs_windows_api.h"
 #include "chrome/browser/extensions/browser_extension_window_controller.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/infobars/simple_alert_infobar_delegate.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
@@ skipping 1779 matching lines @@
 
 void Browser::OnZoomChanged(content::WebContents* source,
                             bool can_show_bubble) {
   if (source == tab_strip_model_->GetActiveWebContents()) {
     // Only show the zoom bubble for zoom changes in the active window.
     window_->ZoomChangedForActiveTab(can_show_bubble && window_->IsActive() &&
         !is_devtools());
   }
 }
 
+void Browser::OnZoomChangeInitiated(content::WebContents* web_contents,
+                                    double old_zoom_level,
+                                    double new_zoom_level,
+                                    ZoomMode zoom_mode) {
+  // TODO(wjmaclean) Is there any way we could hook the TabsEventRouter up

[Devlin, 2014/06/16 19:04:49]

Yes, this is bad.  There might be a good way to attach the router directly, and,
failing that, this type of forwarding should go on a class like TabHelper.

[wjmaclean, 2014/06/18 19:03:54]

Done.

This is a bit messy, since Browser is handling the OnZoomChange event, but we
want the OnZoomChangeInitiated event to go to TabsEventRouter. ZoomObserver
provides default (empty) implementations, so presumably it's ok for a derived
class to choose which events it wants to handle, but then ZoomController only
has support for a single observer.

I think it's reasonable to modify ZoomController to allow it to service multiple
observers, and then the only slightly-ugly piece is hooking up the
TabsEventRouter, which is still managed by Browser.

Let me know if this looks ok.

+  // directly as a ZoomObserver?
+  extensions::TabsWindowsAPI* tabs_windows_api =
+      extensions::TabsWindowsAPI::Get(web_contents->GetBrowserContext());
+  tabs_windows_api->tabs_event_router()->OnZoomChangeInitiated(
+      web_contents, old_zoom_level, new_zoom_level, zoom_mode);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, ui::SelectFileDialog::Listener implementation:
 
 void Browser::FileSelected(const base::FilePath& path, int index,
                            void* params) {
   FileSelectedWithExtraInfo(ui::SelectedFileInfo(path, path), index, params);
 }
 
 void Browser::FileSelectedWithExtraInfo(const ui::SelectedFileInfo& file_info,
                                         int index,
@@ skipping 555 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }