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

Unified Diff: athena/activity/public/activity.h

Issue 596623005: Do not show the activity widget in ActivityManager::AddActivity (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase Created 6 years, 3 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 | « athena/activity/activity_view_manager_impl.cc ('k') | athena/activity/public/activity_view_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/activity/public/activity.h
diff --git a/athena/activity/public/activity.h b/athena/activity/public/activity.h
index b26617a367b0767f330608b71b2d7ab3f693a535..bd7df61f31b384f80a18b11deaef726c122ba796 100644
--- a/athena/activity/public/activity.h
+++ b/athena/activity/public/activity.h
@@ -62,7 +62,10 @@ class ATHENA_EXPORT Activity {
ACTIVITY_MEDIA_STATE_AUDIO_PLAYING // Audible audio is playing in activity.
};
- // Delete an activity.
+ // Shows and activates an activity.
+ static void Show(Activity* activity);
+
+ // Deletes an activity.
static void Delete(Activity* activity);
// The Activity retains ownership of the returned view-model.
@@ -82,6 +85,8 @@ class ATHENA_EXPORT Activity {
// Returns the window for the activity. This can be used to determine the
// stacking order of this activity against others.
+ // TODO(oshima): Consider returning base::Window window instead,
+ // which has Show/ShowInactive and other control methods.
virtual aura::Window* GetWindow() = 0;
protected:
« no previous file with comments | « athena/activity/activity_view_manager_impl.cc ('k') | athena/activity/public/activity_view_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698