chrome/browser/ui/zoom/zoom_controller.h - Issue 580133002: Update entry page type to include error pages when appropriate.

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.h

Issue 580133002: Update entry page type to include error pages when appropriate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Compile fix for unit_tests 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

« no previous file with comments | « chrome/browser/ui/webui/signin/inline_login_handler_impl.cc ('k') | chrome/browser/ui/zoom/zoom_controller.cc » ('j') | content/browser/frame_host/navigation_controller_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/zoom/zoom_controller.h

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

index f1e6a64d0cfc1e918d1f20c2246a521ca01ffef3..d37ec4f0d80319f7e7589b70b79126a1e079a052 100644

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

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

@@ -121,6 +121,11 @@ class ZoomController : public content::WebContentsObserver,

void SetZoomMode(ZoomMode zoom_mode);

// content::WebContentsObserver overrides:

+ virtual void DidCommitProvisionalLoadForFrame(

+ content::RenderFrameHost* render_frame_host,

+ const GURL& url,

+ bool url_is_unreachable,

+ ui::PageTransition transition_type) OVERRIDE;

virtual void DidNavigateMainFrame(

const content::LoadCommittedDetails& details,

const content::FrameNavigateParams& params) OVERRIDE;

@@ -163,6 +168,7 @@ class ZoomController : public content::WebContentsObserver,

content::BrowserContext* browser_context_;

scoped_ptr<content::HostZoomMap::Subscription> zoom_subscription_;

+ bool is_error_page_;

DISALLOW_COPY_AND_ASSIGN(ZoomController);

};