Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5784)

Unified Diff: chrome/browser/ui/tab_helpers.cc

Issue 2019423005: Move //components/ui/zoom to top-level under //components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/panels/panel_host.cc ('k') | chrome/browser/ui/toolbar/app_menu_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/tab_helpers.cc
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
index 3753ece85ebb73ad294926744d1aa6d5c62b21d4..278a741b87381a8f5bebc82593c1926e86129c8d 100644
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -72,8 +72,8 @@
#include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h"
#include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
#include "components/pdf/browser/pdf_web_contents_helper.h"
-#include "components/ui/zoom/zoom_controller.h"
#include "components/web_modal/web_contents_modal_dialog_manager.h"
+#include "components/zoom/zoom_controller.h"
#endif // BUILDFLAG(ANDROID_JAVA_UI)
#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
@@ -135,7 +135,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
#if !BUILDFLAG(ANDROID_JAVA_UI)
// ZoomController comes before common tab helpers since ChromeAutofillClient
// may want to register as a ZoomObserver with it.
- ui_zoom::ZoomController::CreateForWebContents(web_contents);
+ zoom::ZoomController::CreateForWebContents(web_contents);
#endif
// --- Common tab helpers ---
« no previous file with comments | « chrome/browser/ui/panels/panel_host.cc ('k') | chrome/browser/ui/toolbar/app_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698