diff options
| author | pkotwicz <pkotwicz@chromium.org> | 2014-10-01 15:28:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-01 22:29:05 +0000 |
| commit | 3077dead80b469dd98fb7df456333bd5e106415d (patch) | |
| tree | 272633fb3db95d2a41b8e64c9763bdb833a8ff37 /athena/content/web_activity.h | |
| parent | bb6d66a87f2b74d63767065ede05f31861b1ada8 (diff) | |
| download | chromium_src-3077dead80b469dd98fb7df456333bd5e106415d.zip chromium_src-3077dead80b469dd98fb7df456333bd5e106415d.tar.gz chromium_src-3077dead80b469dd98fb7df456333bd5e106415d.tar.bz2 | |
Attach extension related tab helpers to WebActivity's content::WebContents
This has the side effect of allowing the webstore to use the management
extension API.
BUG=417879
TEST=Manual, see bug
Review URL: https://codereview.chromium.org/607703002
Cr-Commit-Position: refs/heads/master@{#297727}
Diffstat (limited to 'athena/content/web_activity.h')
| -rw-r--r-- | athena/content/web_activity.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/athena/content/web_activity.h b/athena/content/web_activity.h index 70f620c..e0ce891 100644 --- a/athena/content/web_activity.h +++ b/athena/content/web_activity.h @@ -95,15 +95,11 @@ class WebActivity : public Activity, // Showing a content proxy instead of the real content to save resoruces. void ShowContentProxy(); - // Reload the content if required, and start observing it. - void ReloadAndObserve(); - content::BrowserContext* browser_context_; - const base::string16 title_; - gfx::ImageSkia icon_; - const GURL url_; AthenaWebView* web_view_; + const base::string16 title_; SkColor title_color_; + gfx::ImageSkia icon_; // The current state for this activity. ActivityState current_state_; |