diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 15:04:42 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 15:04:42 +0000 |
| commit | 11ca72283e4d7c103dfdffae7ef384cc88141d71 (patch) | |
| tree | 72d92b0f04e3b5f6b8a6edb38e9be548454a996b /ui | |
| parent | e3fb71be3d0a45cab81845cf190c75e24ac5eb2d (diff) | |
| download | chromium_src-11ca72283e4d7c103dfdffae7ef384cc88141d71.zip chromium_src-11ca72283e4d7c103dfdffae7ef384cc88141d71.tar.gz chromium_src-11ca72283e4d7c103dfdffae7ef384cc88141d71.tar.bz2 | |
Revert 207374 "cros: Show notification when low-power charger co..."
Broke Win Aura compile:
http://build.chromium.org/p/chromium.win/builders/Win%20Aura%20Builder/builds/9060
> cros: Show notification when low-power charger connected
>
> Encourage the user to plug in the official charger.
>
> Also extract FakeMessageCenter into a message_center_test_support target
> so I can use it for a unit test.
>
> BUG=249852
> TEST=ash_unittests TrayPowerTest.*
>
> Review URL: https://chromiumcodereview.appspot.com/17157007
TBR=jamescook@chromium.org
Review URL: https://codereview.chromium.org/17363004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207436 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/message_center/fake_message_center.h | 2 | ||||
| -rw-r--r-- | ui/message_center/message_center.gyp | 22 |
2 files changed, 5 insertions, 19 deletions
diff --git a/ui/message_center/fake_message_center.h b/ui/message_center/fake_message_center.h index d118ee7..19ced60 100644 --- a/ui/message_center/fake_message_center.h +++ b/ui/message_center/fake_message_center.h @@ -12,7 +12,7 @@ namespace message_center { class NotificationDelegate; // MessageCenter implementation of doing nothing. Useful for tests. -class MESSAGE_CENTER_EXPORT FakeMessageCenter : public MessageCenter { +class FakeMessageCenter : public MessageCenter { public: FakeMessageCenter(); virtual ~FakeMessageCenter(); diff --git a/ui/message_center/message_center.gyp b/ui/message_center/message_center.gyp index ef5a0cc..ee469d2 100644 --- a/ui/message_center/message_center.gyp +++ b/ui/message_center/message_center.gyp @@ -125,23 +125,6 @@ ], }, # target_name: message_center { - 'target_name': 'message_center_test_support', - 'type': 'static_library', - 'dependencies': [ - '../../base/base.gyp:base', - '../../base/base.gyp:test_support_base', - '../../skia/skia.gyp:skia', - '../ui.gyp:ui', - 'message_center', - ], - 'sources': [ - 'fake_message_center.h', - 'fake_message_center.cc', - 'fake_notifier_settings_provider.h', - 'fake_notifier_settings_provider.cc', - ], - }, # target_name: message_center_test_support - { 'target_name': 'message_center_unittests', 'type': 'executable', 'dependencies': [ @@ -152,7 +135,6 @@ '../ui.gyp:run_ui_unittests', '../ui.gyp:ui', 'message_center', - 'message_center_test_support', ], 'sources': [ 'cocoa/notification_controller_unittest.mm', @@ -164,6 +146,10 @@ 'cocoa/tray_view_controller_unittest.mm', 'message_center_tray_unittest.cc', 'message_center_impl_unittest.cc', + 'fake_message_center.h', + 'fake_message_center.cc', + 'fake_notifier_settings_provider.h', + 'fake_notifier_settings_provider.cc', 'notification_list_unittest.cc', 'test/run_all_unittests.cc', ], |