Zoom Extension API

chrome/browser/extensions/api/tabs/tabs_event_router.cc

 // Copyright 2013 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/extensions/api/tabs/tabs_event_router.h"
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
@@ skipping 131 matching lines @@
 
   // Observing NOTIFICATION_WEB_CONTENTS_DESTROYED is necessary because it's
   // possible for tabs to be created, detached and then destroyed without
   // ever having been re-attached and closed. This happens in the case of
   // a devtools WebContents that is opened in window, docked, then closed.
   registrar_.Add(this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
                  content::Source<WebContents>(contents));
 
   registrar_.Add(this, chrome::NOTIFICATION_FAVICON_UPDATED,
                  content::Source<WebContents>(contents));
+
+  registrar_.Add(this, content::NOTIFICATION_WEB_CONTENTS_ZOOM_CHANGE,

[not at google - send to devlin, 2014/04/09 03:52:11]

it's a shame this uses notifications rather than an observer interface.

[paulmeyer, 2014/04/11 03:01:02]

Jam just expressed something similar about the notifcations on the content side.
I have replaced them all now so that I am not using ANY notifications. I did use
an observer interface to replace this one. Done.

On 2014/04/09 03:52:11, kalman wrote:

+                 content::Source<WebContents>(contents));
 }
 
 void TabsEventRouter::UnregisterForTabNotifications(WebContents* contents) {
   registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<NavigationController>(&contents->GetController()));
   registrar_.Remove(this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
       content::Source<WebContents>(contents));
   registrar_.Remove(this, chrome::NOTIFICATION_FAVICON_UPDATED,
       content::Source<WebContents>(contents));
+  registrar_.Remove(this, content::NOTIFICATION_WEB_CONTENTS_ZOOM_CHANGE,
+      content::Source<WebContents>(contents));

[not at google - send to devlin, 2014/04/09 03:52:11]

this code should be using registar_.RemoveAll()

[paulmeyer, 2014/04/11 03:01:02]

I agree, although I'm not using this notification anymore so I don't have any
code here. Is it worth cleaning up the existing "Remove"s here?

On 2014/04/09 03:52:11, kalman wrote:

[not at google - send to devlin, 2014/04/11 15:04:25]

Probably not. Somebody can clean those up separately.

 }
 
 void TabsEventRouter::OnBrowserRemoved(Browser* browser) {
   if (!profile_->IsSameProfile(browser->profile()))
     return;
 
   // Stop listening to TabStripModel events for this browser.
   browser->tab_strip_model()->RemoveObserver(this);
 }
 
@@ skipping 295 matching lines @@
       new Event(tabs::OnUpdated::kEventName, args_base.Pass()));
   event->restrict_to_browser_context = profile;
   event->user_gesture = EventRouter::USER_GESTURE_NOT_ENABLED;
   event->will_dispatch_callback =
       base::Bind(&WillDispatchTabUpdatedEvent,
                  contents,
                  changed_properties.get());
   ExtensionSystem::Get(profile)->event_router()->BroadcastEvent(event.Pass());
 }
 
+void TabsEventRouter::DispatchTabZoomChangeEvent(
+    WebContents* contents,
+    double old_zoom_factor,
+    double new_zoom_factor,
+    base::DictionaryValue* zoom_settings) {
+  DCHECK(contents);
+  scoped_ptr<base::ListValue> args(new base::ListValue);
+  int tab_id = ExtensionTabUtil::GetTabId(contents);
+  if (tab_id < 0)
+    return;
+
+  args->AppendInteger(tab_id);
+  args->AppendDouble(old_zoom_factor);
+  args->AppendDouble(new_zoom_factor);
+  args->Append(zoom_settings);

[not at google - send to devlin, 2014/04/09 03:52:11]

a model will be getting generated for OnZoomChange as well, you shouldn't need
to interact with the Value API.

[paulmeyer, 2014/04/11 03:01:02]

Done.

+
+  Profile* profile = Profile::FromBrowserContext(
+      contents->GetBrowserContext());
+  DispatchEvent(profile, tabs::OnZoomChange::kEventName, args.Pass(),
+                EventRouter::USER_GESTURE_UNKNOWN);
+}
+
 TabsEventRouter::TabEntry* TabsEventRouter::GetTabEntry(
     const WebContents* contents) {
   int tab_id = ExtensionTabUtil::GetTabId(contents);
   std::map<int, TabEntry>::iterator i = tab_entries_.find(tab_id);
   if (tab_entries_.end() == i)
     return NULL;
   return &i->second;
 }
 
 void TabsEventRouter::Observe(int type,
                               const content::NotificationSource& source,
                               const content::NotificationDetails& details) {
   if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {

[not at google - send to devlin, 2014/04/09 03:52:11]

bleh this should be a switch. whatevs.

[paulmeyer, 2014/04/11 03:01:02]

My code is gone from here now too. Is it worth changing the existing code to use
a switch?

On 2014/04/09 03:52:11, kalman wrote:

[not at google - send to devlin, 2014/04/11 15:04:25]

nah

     NavigationController* source_controller =
         content::Source<NavigationController>(source).ptr();
     TabUpdated(source_controller->GetWebContents(), true);
   } else if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {
     // Tab was destroyed after being detached (without being re-attached).
     WebContents* contents = content::Source<WebContents>(source).ptr();
     registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
         content::Source<NavigationController>(&contents->GetController()));
     registrar_.Remove(this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
         content::Source<WebContents>(contents));
     registrar_.Remove(this, chrome::NOTIFICATION_FAVICON_UPDATED,
         content::Source<WebContents>(contents));

[not at google - send to devlin, 2014/04/09 03:52:11]

you presumably need to unregister for tab zoom notifications here too, but this
should just call UnregisterForTabNotifications.

[paulmeyer, 2014/04/11 03:01:02]

Not using notifications anymore.

On 2014/04/09 03:52:11, kalman wrote:

   } else if (type == chrome::NOTIFICATION_FAVICON_UPDATED) {
     bool icon_url_changed = *content::Details<bool>(details).ptr();
     if (icon_url_changed)
       FaviconUrlUpdated(content::Source<WebContents>(source).ptr());
+  } else if (type == content::NOTIFICATION_WEB_CONTENTS_ZOOM_CHANGE) {
+    content::ZoomChangeDetails zoom_change_details =
+        *content::Details<content::ZoomChangeDetails>(details).ptr();
+    double old_zoom_factor =
+        content::ZoomLevelToZoomFactor(zoom_change_details.old_zoom_level);
+    double new_zoom_factor =
+        content::ZoomLevelToZoomFactor(zoom_change_details.new_zoom_level);
+    base::DictionaryValue* zoom_settings = new base::DictionaryValue();
+    ZoomModeToZoomSettings(zoom_change_details.zoom_mode, zoom_settings);
+    DispatchTabZoomChangeEvent(content::Source<WebContents>(source).ptr(),
+                               old_zoom_factor, new_zoom_factor, zoom_settings);
   } else {
     NOTREACHED();
   }
 }
 
 void TabsEventRouter::TabChangedAt(WebContents* contents,
                                    int index,
                                    TabChangeType change_type) {
   TabUpdated(contents, false);
 }
@@ skipping 33 matching lines @@
   if (ExtensionTabUtil::GetTabStripModel(contents, &tab_strip, &tab_index)) {
     scoped_ptr<base::DictionaryValue> changed_properties(
         new base::DictionaryValue());
     changed_properties->SetBoolean(tabs_constants::kPinnedKey,
                                    tab_strip->IsTabPinned(tab_index));
     DispatchTabUpdatedEvent(contents, changed_properties.Pass());
   }
 }
 
 }  // namespace extensions