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

Unified Diff: chrome/browser/ui/panels/panel_host.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/cocoa/location_bar/zoom_decoration_unittest.mm ('k') | chrome/browser/ui/tab_helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/panels/panel_host.cc
diff --git a/chrome/browser/ui/panels/panel_host.cc b/chrome/browser/ui/panels/panel_host.cc
index d42e0b68ead728400ab44b8ea73d45e0027a743d..24965d962daab14f7401024163344ca4f63ecd20 100644
--- a/chrome/browser/ui/panels/panel_host.cc
+++ b/chrome/browser/ui/panels/panel_host.cc
@@ -22,8 +22,8 @@
#include "chrome/browser/ui/panels/panel.h"
#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
#include "components/favicon/content/content_favicon_driver.h"
-#include "components/ui/zoom/page_zoom.h"
-#include "components/ui/zoom/zoom_controller.h"
+#include "components/zoom/page_zoom.h"
+#include "components/zoom/zoom_controller.h"
#include "content/public/browser/invalidate_type.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/notification_service.h"
@@ -64,7 +64,7 @@ void PanelHost::Init(const GURL& url,
web_contents_->SetDelegate(this);
// web_contents_ may be passed to PageZoom::Zoom(), so it needs
// a ZoomController.
- ui_zoom::ZoomController::CreateForWebContents(web_contents_.get());
+ zoom::ZoomController::CreateForWebContents(web_contents_.get());
content::WebContentsObserver::Observe(web_contents_.get());
// Needed to give the web contents a Tab ID. Extension APIs
@@ -249,5 +249,5 @@ void PanelHost::StopLoading() {
}
void PanelHost::Zoom(content::PageZoom zoom) {
- ui_zoom::PageZoom::Zoom(web_contents_.get(), zoom);
+ zoom::PageZoom::Zoom(web_contents_.get(), zoom);
}
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/zoom_decoration_unittest.mm ('k') | chrome/browser/ui/tab_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698