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

Unified Diff: athena/content/web_activity.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/web_activity.h ('k') | athena/test/base/sample_activity.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/content/web_activity.cc
diff --git a/athena/content/web_activity.cc b/athena/content/web_activity.cc
index b29deef77d7a6eedf6b8e491aa0f7fad374013ad..2aae6e86b5f5a80e419906a4af7878e450a88aa1 100644
--- a/athena/content/web_activity.cc
+++ b/athena/content/web_activity.cc
@@ -528,7 +528,8 @@ Activity::ActivityMediaState WebActivity::GetMediaState() {
}
aura::Window* WebActivity::GetWindow() {
- return web_view_->GetWidget()->GetNativeWindow();
+ return web_view_->GetWidget() ? web_view_->GetWidget()->GetNativeWindow()
+ : nullptr;
}
content::WebContents* WebActivity::GetWebContents() {
@@ -564,10 +565,6 @@ views::View* WebActivity::GetContentsView() {
return web_view_;
}
-views::Widget* WebActivity::CreateWidget() {
- return nullptr; // Use default widget.
-}
-
gfx::ImageSkia WebActivity::GetOverviewModeImage() {
if (content_proxy_.get())
return content_proxy_->GetContentImage();
« no previous file with comments | « athena/content/web_activity.h ('k') | athena/test/base/sample_activity.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698