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

Unified Diff: athena/activity/activity_manager_impl.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 | « no previous file | athena/activity/public/activity_view_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/activity/activity_manager_impl.cc
diff --git a/athena/activity/activity_manager_impl.cc b/athena/activity/activity_manager_impl.cc
index 71216df0ed734980b7c140f14177532c811239eb..f8590f633cc694a703dfe169e553a3ad47000355 100644
--- a/athena/activity/activity_manager_impl.cc
+++ b/athena/activity/activity_manager_impl.cc
@@ -21,13 +21,15 @@ namespace {
ActivityManager* instance = nullptr;
views::Widget* CreateWidget(Activity* activity) {
- ActivityViewModel* view_model = activity->GetActivityViewModel();
- views::Widget* widget = view_model->CreateWidget();
+ aura::Window* window = activity->GetWindow();
+ views::Widget* widget =
+ window ? views::Widget::GetWidgetForNativeView(window) : nullptr;
if (widget)
return widget;
widget = new views::Widget;
views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
- params.delegate = new ActivityWidgetDelegate(view_model);
+ params.delegate =
+ new ActivityWidgetDelegate(activity->GetActivityViewModel());
widget->Init(params);
activity->GetActivityViewModel()->Init();
return widget;
« no previous file with comments | « no previous file | athena/activity/public/activity_view_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698