chrome/browser/devtools/devtools_window.cc - Issue 373733003: Make sure WebContents passed to chrome_page_zoom::Zoom() have a ZoomController.

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 373733003: Make sure WebContents passed to chrome_page_zoom::Zoom() have a ZoomController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to r282074. Created 6 years, 5 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

Index: chrome/browser/devtools/devtools_window.cc

diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc

index 9f1fc48a0d291911adbb45269330e4d1d443e177..b1691820913684a5a06746628dae0d9026d75d6b 100644

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

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

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

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

@@ -707,6 +708,11 @@ DevToolsWindow::DevToolsWindow(Profile* profile,

DevToolsUIBindings::ApplyThemeToURL(profile, url));

// Bindings take ownership over devtools as its delegate.

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_)

+ ->SetShowsNotificationBubble(false);

g_instances.Get().push_back(this);

« no previous file with comments | « chrome/browser/chrome_page_zoom.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »