Decoupling visibility states from webcontent, adding visibility management in ResourceManager

athena/activity/public/activity.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ATHENA_ACTIVITY_PUBLIC_ACTIVITY_H_
 #define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_H_
 
 #include <string>
 
 #include "athena/athena_export.h"
@@ skipping 42 matching lines @@
   // This enum declares the media state the activity is in.
   // TODO(skuhne): Move the |TabMediaState| out of chrome and combine it in a
   // media library within content and then use that enum instead.
   enum ActivityMediaState {
     ACTIVITY_MEDIA_STATE_NONE,
     ACTIVITY_MEDIA_STATE_RECORDING,  // Audio/Video being recorded by activity.
     ACTIVITY_MEDIA_STATE_CAPTURING,  // Activity is being captured.
     ACTIVITY_MEDIA_STATE_AUDIO_PLAYING  // Audible audio is playing in activity.
   };
 
-  virtual ~Activity();
+  // Close an activity.
+  static void CloseActivity(Activity* activity);
 
   // The Activity retains ownership of the returned view-model.
   virtual ActivityViewModel* GetActivityViewModel() = 0;
 
   // Transition the activity into a new state.
   virtual void SetCurrentState(ActivityState state) = 0;
 
   // Returns the current state of the activity.
   virtual ActivityState GetCurrentState() = 0;
 
   // Returns if the activity is visible or not.
   virtual bool IsVisible() = 0;
 
   // Returns the current media state.
   virtual ActivityMediaState GetMediaState() = 0;
 
   // Returns the window for the activity. This can be used to determine the
   // stacking order of this activity against others.
   virtual aura::Window* GetWindow() = 0;
+
+ protected:
+  virtual ~Activity() {}
 };
 
 }  // namespace athena
 
 #endif  // ATHENA_ACTIVITY_PUBLIC_ACTIVITY_H_