Zoom Extension API

chrome/browser/ui/zoom/zoom_controller.cc

Index: chrome/browser/ui/zoom/zoom_controller.cc
diff --git a/chrome/browser/ui/zoom/zoom_controller.cc b/chrome/browser/ui/zoom/zoom_controller.cc
index 64ac8efe22d39da6163d5c3e0312324aee2562f3..d077c849d1b42d3983f8e15f533105f79273d21b 100644
--- a/chrome/browser/ui/zoom/zoom_controller.cc
+++ b/chrome/browser/ui/zoom/zoom_controller.cc
@@ -24,14 +24,17 @@ DEFINE_WEB_CONTENTS_USER_DATA_KEY(ZoomController);
 ZoomController::ZoomController(content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       zoom_percent_(100),
+      last_zoom_id_(0),
       observer_(NULL),
       browser_context_(web_contents->GetBrowserContext()) {
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
-  default_zoom_level_.Init(prefs::kDefaultZoomLevel, profile->GetPrefs(),
-                           base::Bind(&ZoomController::UpdateState,
-                                      base::Unretained(this),
-                                      std::string()));
+  default_zoom_level_.Init(
+      prefs::kDefaultZoomLevel, profile->GetPrefs(),
+      base::Bind(static_cast<void(ZoomController::*)(
+          const std::string&)>(&ZoomController::UpdateState),
+                 base::Unretained(this),
+                 std::string()));
 
   zoom_subscription_ = content::HostZoomMap::GetForBrowserContext(
       browser_context_)->AddZoomLevelChangedCallback(
@@ -55,6 +58,32 @@ int ZoomController::GetResourceForZoomLevel() const {
   return zoom > default_zoom_level_.GetValue() ? IDR_ZOOM_PLUS : IDR_ZOOM_MINUS;
 }
 
+const extensions::Extension* ZoomController::GetExtensionById(
+    int zoom_id) const {
+  if (last_zoom_id_) {
+    ZoomExtensionMap::const_iterator it =
+        zoom_extension_map_.find(last_zoom_id_);
+    if (it != zoom_extension_map_.end()) {
+      return it->second.get();
+    }
+  }
+  return  NULL;
+}
+
+int ZoomController::last_zoom_id() const {

[Fady Samuel, 2014/04/07 20:01:14]

I'm really not a fan of exposing ZoomIds.

[paulmeyer, 2014/04/07 20:56:10]

Okay, will work on getting rid of all zoom ID stuff once other changes are out
of the way and Ben can start reviewing this patch.

+  return last_zoom_id_;
+}
+
+int ZoomController::SetZoomLevelByExtension(
+    double zoom_level,
+    scoped_refptr<const extensions::Extension> extension) {
+  int zoom_id = web_contents()->SetZoomLevel(zoom_level);
+  if (zoom_id) {
+    zoom_extension_map_.insert(std::make_pair(zoom_id, extension));
+  }
+  return zoom_id;
+}
+
 void ZoomController::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
@@ -65,10 +94,34 @@ void ZoomController::DidNavigateMainFrame(
 
 void ZoomController::OnZoomLevelChanged(
     const content::HostZoomMap::ZoomLevelChange& change) {
-  UpdateState(change.host);
+  UpdateState(change.host,
+              change.zoom_id,
+              change.mode == content::HostZoomMap::ZOOM_CHANGED_TEMPORARY_ZOOM);
 }
 
 void ZoomController::UpdateState(const std::string& host) {
+  UpdateState(host, 0, false);
+}
+
+void ZoomController::UpdateState(const std::string& host,
+                                 int zoom_id,
+                                 bool is_temporary_zoom) {
+  // Remove old zoom extension map entries and update |last_zoom_id_|.
+  if (last_zoom_id_) {
+    ZoomExtensionMap::iterator it = zoom_extension_map_.find(last_zoom_id_);
+    if (it != zoom_extension_map_.end()) {
+      zoom_extension_map_.erase(it);
+    }
+  }
+  last_zoom_id_ = zoom_id;
+
+  if (zoom_id) {
+    content::NotificationService::current()->Notify(
+        chrome::NOTIFICATION_TAB_ZOOM_CHANGE_COMPLETE,
+        content::Source<ZoomController>(this),
+        content::Details<int>(&zoom_id));
+  }
+
   // If |host| is empty, all observers should be updated.
   if (!host.empty()) {
     // Use the navigation entry's URL instead of the WebContents' so virtual
@@ -80,10 +133,13 @@ void ZoomController::UpdateState(const std::string& host) {
       return;
     }
   }
-
   bool dummy;
   zoom_percent_ = web_contents()->GetZoomPercent(&dummy, &dummy);
 
-  if (observer_)
-    observer_->OnZoomChanged(web_contents(), !host.empty());
+  if (observer_) {
+    bool can_show_bubble =
+        web_contents()->GetZoomMode() != content::kZoomModeDefault ||

[Fady Samuel, 2014/04/07 20:01:14]

This needs some explanation. 

[paulmeyer, 2014/04/07 20:56:10]

Done.

+        (!host.empty() && !is_temporary_zoom);
+    observer_->OnZoomChanged(web_contents(), can_show_bubble);
+  }
 }