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

Unified Diff: components/guest_view/browser/guest_view_base.h

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 | « components/guest_view/browser/DEPS ('k') | components/guest_view/browser/guest_view_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/guest_view/browser/guest_view_base.h
diff --git a/components/guest_view/browser/guest_view_base.h b/components/guest_view/browser/guest_view_base.h
index 8f216853bb9410febacc3abe711c7e71dfaad2d1..17056d6fcc5c4302c36cfe904d8ffa80f386de4a 100644
--- a/components/guest_view/browser/guest_view_base.h
+++ b/components/guest_view/browser/guest_view_base.h
@@ -12,7 +12,7 @@
#include "base/memory/weak_ptr.h"
#include "base/values.h"
#include "components/guest_view/common/guest_view_constants.h"
-#include "components/ui/zoom/zoom_observer.h"
+#include "components/zoom/zoom_observer.h"
#include "content/public/browser/browser_plugin_guest_delegate.h"
#include "content/public/browser/guest_host.h"
#include "content/public/browser/render_process_host_observer.h"
@@ -51,7 +51,7 @@ struct SetSizeParams {
class GuestViewBase : public content::BrowserPluginGuestDelegate,
public content::WebContentsDelegate,
public content::WebContentsObserver,
- public ui_zoom::ZoomObserver {
+ public zoom::ZoomObserver {
public:
// Returns a *ViewGuest if this GuestView is of the given view type.
template <typename T>
@@ -379,7 +379,7 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
// ui_zoom::ZoomObserver implementation.
void OnZoomChanged(
- const ui_zoom::ZoomController::ZoomChangedEventData& data) final;
+ const zoom::ZoomController::ZoomChangedEventData& data) final;
void SendQueuedEvents();
« no previous file with comments | « components/guest_view/browser/DEPS ('k') | components/guest_view/browser/guest_view_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698