summaryrefslogtreecommitdiffstats
path: root/chromium/chrome/browser/extensions/api/tabs/tabs_event_router.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/chrome/browser/extensions/api/tabs/tabs_event_router.cc')
-rw-r--r--chromium/chrome/browser/extensions/api/tabs/tabs_event_router.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/chromium/chrome/browser/extensions/api/tabs/tabs_event_router.cc b/chromium/chrome/browser/extensions/api/tabs/tabs_event_router.cc
index f86ebb9b063..402d3de9620 100644
--- a/chromium/chrome/browser/extensions/api/tabs/tabs_event_router.cc
+++ b/chromium/chrome/browser/extensions/api/tabs/tabs_event_router.cc
@@ -28,6 +28,7 @@
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/web_contents.h"
#include "extensions/common/features/feature.h"
+#include "third_party/blink/public/common/page/page_zoom.h"
using base::DictionaryValue;
using base::ListValue;
@@ -162,10 +163,7 @@ void TabsEventRouter::TabEntry::WebContentsDestroyed() {
}
TabsEventRouter::TabsEventRouter(Profile* profile)
- : profile_(profile),
- favicon_scoped_observer_(this),
- browser_tab_strip_tracker_(this, this, this),
- tab_manager_scoped_observer_(this) {
+ : profile_(profile), browser_tab_strip_tracker_(this, this, this) {
DCHECK(!profile->IsOffTheRecord());
browser_tab_strip_tracker_.Init();
@@ -275,9 +273,9 @@ void TabsEventRouter::OnZoomChanged(
api::tabs::OnZoomChange::ZoomChangeInfo zoom_change_info;
zoom_change_info.tab_id = tab_id;
zoom_change_info.old_zoom_factor =
- content::ZoomLevelToZoomFactor(data.old_zoom_level);
+ blink::PageZoomLevelToZoomFactor(data.old_zoom_level);
zoom_change_info.new_zoom_factor =
- content::ZoomLevelToZoomFactor(data.new_zoom_level);
+ blink::PageZoomLevelToZoomFactor(data.new_zoom_level);
ZoomModeToZoomSettings(data.zoom_mode, &zoom_change_info.zoom_settings);
// Dispatch the |onZoomChange| event.