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

Unified Diff: chrome/browser/devtools/devtools_window.cc

Issue 769593003: Move ZoomObserver, ZoomController and ZoomEventManager to components/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove obsolete defines in build files. Created 6 years 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/chrome_page_zoom.cc ('k') | chrome/browser/extensions/api/tabs/tabs_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/devtools/devtools_window.cc
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index 94724663cd5294d3faf5939ff22c46922e28ca13..31c8c2c706a2c538cfa009c9c58c8f0996c6fa36 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -26,12 +26,12 @@
#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/webui/devtools_ui.h"
-#include "chrome/browser/ui/zoom/zoom_controller.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/url_constants.h"
#include "components/pref_registry/pref_registry_syncable.h"
+#include "components/ui/zoom/zoom_controller.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/devtools_agent_host.h"
#include "content/public/browser/native_web_keyboard_event.h"
@@ -693,8 +693,8 @@ DevToolsWindow::DevToolsWindow(Profile* profile,
bindings_->SetDelegate(this);
// DevTools uses chrome_page_zoom::Zoom(), so main_web_contents_ requires a
// ZoomController.
- ZoomController::CreateForWebContents(main_web_contents_);
- ZoomController::FromWebContents(main_web_contents_)
+ ui_zoom::ZoomController::CreateForWebContents(main_web_contents_);
+ ui_zoom::ZoomController::FromWebContents(main_web_contents_)
->SetShowsNotificationBubble(false);
g_instances.Get().push_back(this);
« no previous file with comments | « chrome/browser/chrome_page_zoom.cc ('k') | chrome/browser/extensions/api/tabs/tabs_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698