| Index: athena/content/app_activity.h
|
| diff --git a/athena/content/app_activity.h b/athena/content/app_activity.h
|
| index 9bacf45b550324a5ceb6f8dcbbffb9740f4fa6fa..f141053491b9454da3a8e218e7c47dc9613fc684 100644
|
| --- a/athena/content/app_activity.h
|
| +++ b/athena/content/app_activity.h
|
| @@ -28,7 +28,6 @@ class AppActivity : public Activity,
|
| public content::WebContentsObserver {
|
| public:
|
| explicit AppActivity(const std::string& app_id);
|
| - virtual ~AppActivity();
|
|
|
| // Activity:
|
| virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE;
|
| @@ -48,19 +47,32 @@ class AppActivity : public Activity,
|
| virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;
|
|
|
| protected:
|
| - // content::WebContentsObserver:
|
| + virtual ~AppActivity();
|
| +
|
| + // content::WebContentsObserver:
|
| virtual void TitleWasSet(content::NavigationEntry* entry,
|
| bool explicit_set) OVERRIDE;
|
| virtual void DidUpdateFaviconURL(
|
| const std::vector<content::FaviconURL>& candidates) OVERRIDE;
|
|
|
| - protected:
|
| virtual content::WebContents* GetWebContents() = 0;
|
|
|
| private:
|
| // Register this activity with its application.
|
| void RegisterActivity();
|
|
|
| + // Make the content visible. This call should only be paired with
|
| + // MakeInvisible. Note: Upon start the content is visible.
|
| + // TODO(skuhne): If this can be combined with web_activity, move this into a
|
| + // separate class.
|
| + void MakeVisible();
|
| +
|
| + // Make the content invisible. This call should only be paired with
|
| + // MakeVisible.
|
| + // TODO(skuhne): If this can be combined with web_activity, move this into a
|
| + // separate class.
|
| + void MakeInvisible();
|
| +
|
| const std::string app_id_;
|
|
|
| views::WebView* web_view_;
|
|
|