diff options
| author | oshima <oshima@chromium.org> | 2014-09-24 14:28:50 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-24 21:29:09 +0000 |
| commit | c856b9bf12c634b7b5f2879761fb8a63cc5f0822 (patch) | |
| tree | d2decdd2d4c8c546d9d4079c81f7897353536ff7 /athena/athena.gyp | |
| parent | 8d01729a29f61388655fe8abbbff506697777fa5 (diff) | |
| download | chromium_src-c856b9bf12c634b7b5f2879761fb8a63cc5f0822.zip chromium_src-c856b9bf12c634b7b5f2879761fb8a63cc5f0822.tar.gz chromium_src-c856b9bf12c634b7b5f2879761fb8a63cc5f0822.tar.bz2 | |
Do not show the activity widget in ActivityManager::AddActivity
* Instead, show it explicitly on caller side. This is necessary as the extensions system controls the app window's visibility.
Remove ActivityViewManager
Instead of keeping activity -> widget map, use views::Widget::GetWidgetForNativeWindow
BUG=417017
TEST=ActivityManagerTest.Basic
Review URL: https://codereview.chromium.org/596623005
Cr-Commit-Position: refs/heads/master@{#296524}
Diffstat (limited to 'athena/athena.gyp')
| -rw-r--r-- | athena/athena.gyp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/athena/athena.gyp b/athena/athena.gyp index 2044bc4b..1ef460c 100644 --- a/athena/athena.gyp +++ b/athena/athena.gyp @@ -39,7 +39,6 @@ 'activity/activity_factory.cc', 'activity/activity_manager_impl.cc', 'activity/activity_manager_impl.h', - 'activity/activity_view_manager_impl.cc', 'activity/activity_frame_view.cc', 'activity/activity_frame_view.h', 'activity/activity_widget_delegate.cc', @@ -48,7 +47,6 @@ 'activity/public/activity_factory.h', 'activity/public/activity_manager.h', 'activity/public/activity_manager_observer.h', - 'activity/public/activity_view_manager.h', 'activity/public/activity_view_model.h', 'athena_export.h', 'env/athena_env_impl.cc', |