Commit 2a49d598 authored by xiyuan's avatar xiyuan Committed by Commit bot

Fix ZoomController crash on kiosk launching.

BUG=418214

Review URL: https://codereview.chromium.org/609983002

Cr-Commit-Position: refs/heads/master@{#297094}
parent 1b198fa1
...@@ -79,9 +79,10 @@ bool ZoomController::SetZoomLevel(double zoom_level) { ...@@ -79,9 +79,10 @@ bool ZoomController::SetZoomLevel(double zoom_level) {
bool ZoomController::SetZoomLevelByExtension( bool ZoomController::SetZoomLevelByExtension(
double zoom_level, double zoom_level,
const scoped_refptr<const extensions::Extension>& extension) { const scoped_refptr<const extensions::Extension>& extension) {
content::NavigationEntry* entry =
web_contents()->GetController().GetLastCommittedEntry();
bool is_normal_page = bool is_normal_page =
web_contents()->GetController().GetLastCommittedEntry()->GetPageType() == entry && entry->GetPageType() == content::PAGE_TYPE_NORMAL;
content::PAGE_TYPE_NORMAL;
// Cannot zoom in disabled mode. Also, don't allow changing zoom level on // Cannot zoom in disabled mode. Also, don't allow changing zoom level on
// a crashed tab, an error page or an interstitial page. // a crashed tab, an error page or an interstitial page.
if (zoom_mode_ == ZOOM_MODE_DISABLED || if (zoom_mode_ == ZOOM_MODE_DISABLED ||
...@@ -134,9 +135,6 @@ bool ZoomController::SetZoomLevelByExtension( ...@@ -134,9 +135,6 @@ bool ZoomController::SetZoomLevelByExtension(
zoom_map->SetTemporaryZoomLevel( zoom_map->SetTemporaryZoomLevel(
render_process_id, render_view_id, zoom_level); render_process_id, render_view_id, zoom_level);
} else { } else {
content::NavigationEntry* entry =
web_contents()->GetController().GetLastCommittedEntry();
if (!entry) { if (!entry) {
last_extension_ = NULL; last_extension_ = NULL;
return false; return false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment