Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1214)

Unified Diff: extensions/browser/app_window/app_window.cc

Issue 1668973002: Fix AppWindow access to uninitialized AppWindowContents. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/app_window/app_window.cc
diff --git a/extensions/browser/app_window/app_window.cc b/extensions/browser/app_window/app_window.cc
index e328ecfc9c045c5fd88bee014b391ab9a343578a..5bb73e65f741281d507f804a1b889fcf9bfc79ea 100644
--- a/extensions/browser/app_window/app_window.cc
+++ b/extensions/browser/app_window/app_window.cc
@@ -520,7 +520,9 @@ void AppWindow::OnNativeWindowActivated() {
}
content::WebContents* AppWindow::web_contents() const {
- return app_window_contents_->GetWebContents();
+ if (app_window_contents_)
+ return app_window_contents_->GetWebContents();
+ return nullptr;
}
const Extension* AppWindow::GetExtension() const {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698