Index: chrome/browser/ui/tab_helpers.cc |
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc |
index a8d1d09311fa90c7e317240de89da569c4e5ac96..1f293f1dfd9481cebca132af64171fa789fce919 100644 |
--- a/chrome/browser/ui/tab_helpers.cc |
+++ b/chrome/browser/ui/tab_helpers.cc |
@@ -112,6 +112,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { |
// SessionTabHelper comes first because it sets up the tab ID, and other |
// helpers may rely on that. |
SessionTabHelper::CreateForWebContents(web_contents); |
+ // ZoomController comes next since ChromeAutofillClient may want to register |
+ // as a ZoomObserver with it. |
+#if !defined(OS_ANDROID) |
+ ZoomController::CreateForWebContents(web_contents); |
+#endif |
// --- Common tab helpers --- |
@@ -164,7 +169,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { |
TabContentsSyncedTabDelegate::CreateForWebContents(web_contents); |
ThumbnailTabHelper::CreateForWebContents(web_contents); |
web_modal::WebContentsModalDialogManager::CreateForWebContents(web_contents); |
- ZoomController::CreateForWebContents(web_contents); |
#endif |
#if defined(OS_WIN) |