diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-13 17:01:48 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-13 17:01:48 +0000 |
| commit | 9f19d5c7ddfe7ddd5c64fe8ab6ac67fc9782200d (patch) | |
| tree | 1b6dfc477f6605d46e5e40fcaed75729adc23981 /ash/ash.gyp | |
| parent | 194ccb04c7d7323f5a74b85cd248c159888929c3 (diff) | |
| download | chromium_src-9f19d5c7ddfe7ddd5c64fe8ab6ac67fc9782200d.zip chromium_src-9f19d5c7ddfe7ddd5c64fe8ab6ac67fc9782200d.tar.gz chromium_src-9f19d5c7ddfe7ddd5c64fe8ab6ac67fc9782200d.tar.bz2 | |
Refactors TestSystemTrayDelegate into DefaultSystemTrayDelegate (2)
Original patch was reverted as TestSystemTrayDelegate had an ASH_EXPORT, which caused compile error win-aura builder.
DefaultSystemTrayDelegate is the no-op implementation and
TestSystemTrayDelegate contains the test related bits.
This also fixes a crash in the windows side as
TestSystemTrayDelegate::Shutdown() quits the message loop, which is
the wrong thing to do.
BUG=159693 284358
TEST=none
R=oshima@chromium.org
TBR=oshima@chromium.org
Review URL: https://codereview.chromium.org/23792007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223066 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash.gyp')
| -rw-r--r-- | ash/ash.gyp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index 830e9d6..83e097e 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -297,6 +297,8 @@ 'system/system_notifier.h', 'system/tray/actionable_view.cc', 'system/tray/actionable_view.h', + 'system/tray/default_system_tray_delegate.cc', + 'system/tray/default_system_tray_delegate.h', 'system/tray/fixed_sized_image_view.cc', 'system/tray/fixed_sized_image_view.h', 'system/tray/fixed_sized_scroll_view.cc', @@ -315,8 +317,6 @@ 'system/tray/system_tray_item.h', 'system/tray/system_tray_notifier.cc', 'system/tray/system_tray_notifier.h', - 'system/tray/test_system_tray_delegate.cc', - 'system/tray/test_system_tray_delegate.h', 'system/tray/throbber_view.cc', 'system/tray/throbber_view.h', 'system/tray/tray_background_view.cc', @@ -626,6 +626,8 @@ 'test/test_suite.h', 'test/test_suite_init.h', 'test/test_suite_init.mm', + 'test/test_system_tray_delegate.cc', + 'test/test_system_tray_delegate.h', 'test/ui_controls_factory_ash.cc', 'test/ui_controls_factory_ash.h', ], |