chrome/browser/devtools/devtools_window.cc - Issue 769593003: Move ZoomObserver, ZoomController and ZoomEventManager to components/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Mac build fix #4. 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') | chrome/browser/ui/views/location_bar/zoom_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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..1fe1d616f8f177415286ac8745f72f60c61c2cd4 100644

--- a/chrome/browser/devtools/devtools_window.cc

+++ b/chrome/browser/devtools/devtools_window.cc

@@ -26,7 +26,6 @@

#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"

@@ -45,6 +44,7 @@

#include "content/public/browser/web_contents.h"

#include "content/public/common/content_client.h"

#include "content/public/common/url_constants.h"

+#include "extensions/browser/ui/zoom/zoom_controller.h"

#include "net/base/escape.h"

#include "third_party/WebKit/public/web/WebInputEvent.h"

#include "ui/base/page_transition_types.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_)

+ extensions::ZoomController::CreateForWebContents(main_web_contents_);

+ extensions::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') | chrome/browser/ui/views/location_bar/zoom_view.cc » ('J')