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

Unified Diff: athena/content/app_activity_proxy.cc

Issue 702473005: athena: Remove ActivityViewModel::CreateWidget(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 | « athena/content/app_activity_proxy.h ('k') | athena/content/app_activity_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/content/app_activity_proxy.cc
diff --git a/athena/content/app_activity_proxy.cc b/athena/content/app_activity_proxy.cc
index c2d0e34de0ef8335ceb5c3bee3150cc27c2fdeea..77953ced19921c51c87baea81eca70fa0feff2d2 100644
--- a/athena/content/app_activity_proxy.cc
+++ b/athena/content/app_activity_proxy.cc
@@ -52,7 +52,7 @@ Activity::ActivityMediaState AppActivityProxy::GetMediaState() {
}
aura::Window* AppActivityProxy::GetWindow() {
- return view_->GetWidget()->GetNativeWindow();
+ return view_->GetWidget() ? view_->GetWidget()->GetNativeWindow() : nullptr;
}
content::WebContents* AppActivityProxy::GetWebContents() {
@@ -92,10 +92,6 @@ views::View* AppActivityProxy::GetContentsView() {
return view_;
}
-views::Widget* AppActivityProxy::CreateWidget() {
- return nullptr;
-}
-
gfx::ImageSkia AppActivityProxy::GetOverviewModeImage() {
return content_proxy_->GetContentImage();
}
« no previous file with comments | « athena/content/app_activity_proxy.h ('k') | athena/content/app_activity_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698