diff options
author | jamescook <jamescook@chromium.org> | 2014-09-15 11:27:13 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-15 18:31:44 +0000 |
commit | 877e2ab661da959e844d0f0f1e71f815d32d8c77 (patch) | |
tree | 5fc270aa7330836c0e8070f2c0a642cb973438d5 /athena/content/shell/shell_app_activity.h | |
parent | e380f604301c5cdde7d0fad496a5d46c80233afc (diff) | |
download | chromium_src-877e2ab661da959e844d0f0f1e71f815d32d8c77.zip chromium_src-877e2ab661da959e844d0f0f1e71f815d32d8c77.tar.gz chromium_src-877e2ab661da959e844d0f0f1e71f815d32d8c77.tar.bz2 |
Remove app_shell chrome.shell API and ShellAppWindow
The chrome.app.window API has been moved to src/extensions, so app_shell
no longer needs its custom chrome.shell API to open windows.
* Remove the API implementation -- mostly a manual revert of https://codereview.chromium.org/254473011/
* Remove app_shell_resources.grd since there are no more app_shell resources
* Remove athena's support for ShellAppWindow
* Fix example apps to remove the chrome.shell workaround.
No presubmit because it has a false-positive warning about the enum rename in extension_function_histogram_value.h
No try because no presubmit doesn't seem to work by itself.
BUG=413164
TEST=extensions_unittests, app_shell_unittests, app_shell_browsertests
TBR=isherman@chromium.org for deprecating an extension function histogram
NOPRESUBMIT=true
NOTRY=true
Review URL: https://codereview.chromium.org/571643003
Cr-Commit-Position: refs/heads/master@{#294852}
Diffstat (limited to 'athena/content/shell/shell_app_activity.h')
-rw-r--r-- | athena/content/shell/shell_app_activity.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/athena/content/shell/shell_app_activity.h b/athena/content/shell/shell_app_activity.h index ad3467b..a6b7dec 100644 --- a/athena/content/shell/shell_app_activity.h +++ b/athena/content/shell/shell_app_activity.h @@ -11,7 +11,6 @@ namespace extensions { class AppWindow; -class ShellAppWindow; } namespace athena { @@ -19,9 +18,6 @@ namespace athena { class ShellAppActivity : public AppActivity { public: explicit ShellAppActivity(extensions::AppWindow* app_window); - // TODO(hashimoto) Remove this. - ShellAppActivity(extensions::ShellAppWindow* app_window, - const std::string& app_id); virtual ~ShellAppActivity(); private: @@ -32,7 +28,6 @@ class ShellAppActivity : public AppActivity { virtual views::WebView* GetWebView() OVERRIDE; extensions::AppWindow* app_window_; - scoped_ptr<extensions::ShellAppWindow> shell_app_window_; DISALLOW_COPY_AND_ASSIGN(ShellAppActivity); }; |