chrome/browser/ui/zoom/zoom_controller.cc - Issue 529993002: Use IsRenderViewLive() to test for SadTab in 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/ui/zoom/zoom_controller.cc

Issue 529993002: Use IsRenderViewLive() to test for SadTab in ZoomController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase to r292920. Created 6 years, 3 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/ui/zoom/zoom_controller.cc

diff --git a/chrome/browser/ui/zoom/zoom_controller.cc b/chrome/browser/ui/zoom/zoom_controller.cc

index fd9a3dc1d679adad6412a23ae3f2fc231a9b2b67..95ab757f3f7d5bf75cc7c3956e7045ae7fb3afae 100644

--- a/chrome/browser/ui/zoom/zoom_controller.cc

+++ b/chrome/browser/ui/zoom/zoom_controller.cc

@@ -4,6 +4,7 @@

#include "chrome/browser/ui/zoom/zoom_controller.h"

+#include "chrome/browser/ui/sad_tab.h"

#include "chrome/browser/ui/zoom/zoom_event_manager.h"

#include "chrome/browser/ui/zoom/zoom_observer.h"

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

@@ -80,7 +81,7 @@ bool ZoomController::SetZoomLevelByExtension(

// Cannot zoom in disabled mode. Also, don't allow changing zoom level on

// a crashed tab.

if (zoom_mode_ == ZOOM_MODE_DISABLED ||

- !web_contents()->GetRenderProcessHost()->HasConnection())

+ !web_contents()->GetRenderViewHost()->IsRenderViewLive())

return false;

// Store extension data so that |extension| can be attributed when the zoom

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