Revert 222957 "Refactors TestSystemTrayDelegate into DefaultSyst..."
commit39594f64142380e8ed8e06e10deb1396d0fa52dc
authorcpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Fri, 13 Sep 2013 03:08:49 +0000 (13 03:08 +0000)
committercpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Fri, 13 Sep 2013 03:08:49 +0000 (13 03:08 +0000)
treef91eff5d77bee32c6c8a8ee95a1a2e958e2a1c7c
parent8019cf950502180caa60a6cf7b52fc5934745e3f
Revert 222957 "Refactors TestSystemTrayDelegate into DefaultSyst..."

It broke Aura windows builder

FAILED: ninja -t msvc -e environment.x86 -- C:\b\build\goma\gomacc.exe "c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\cl.exe" /nologo /showIncludes /FC @obj\ash\test\ash_test_support.test_system_tray_delegate.obj.rsp /c ..\..\ash\test\test_system_tray_delegate.cc /Foobj\ash\test\ash_test_support.test_system_tray_delegate.obj /Fdobj\ash\ash_test_support.pdb
c:\b\build\slave\win_aura_builder\build\src\ash\test\test_system_tray_delegate.cc(24) : error C2220: warning treated as error - no 'object' file generated
c:\b\build\slave\win_aura_builder\build\src\ash\test\test_system_tray_delegate.cc(24) : warning C4273: 'ash::test::TestSystemTrayDelegate::TestSystemTrayDelegate' : inconsistent dll linkage
        c:\b\build\slave\win_aura_builder\build\src\ash\test\test_system_tray_delegate.h(15) : see previous definition of '{ctor}'
c:\b\build\slave\win_aura_builder\build\src\ash\test\test_system_tray_delegate.cc(28) : warning C4273: 'ash::test::TestSystemTrayDelegate::~TestSystemTrayDelegate' : inconsistent dll linkage
        c:\b\build\slave\win_aura_builder\build\src\ash\test\test_system_tray_delegate.h(16) : see previous definition of '{dtor}'
c:\b\build\slave\win_aura_builder\build\src\ash\test\test_system_tray_delegate.cc(33) : warning C4273: 'ash::test::TestSystemTrayDelegate::SetInitialLoginStatus' : inconsistent dll linkage
        c:\b\build\slave\win_aura_builder\build\src\ash\test\test_system_tray_delegate.h(23) : see previous definition of 'SetInitialLoginStatus'
c:\b\build\slave\win_aura_builder\build\src\ash\test\test_system_tray_delegate.cc(37) : warning C4273: 'ash::test::TestSystemTrayDelegate::SetLoginStatus' : inconsistent dll linkage
        c:\b\build\slave\win_aura_builder\build\src\ash\test\test_system_tray_delegate.h(30) : see previous definition of 'SetLoginStatus'
c:\b\build\slave\win_aura_builder\build\src\ash\test\test_system_tray_delegate.cc(42) : warning C4273: 'ash::test::TestSystemTrayDelegate::GetUserLoginStatus' : inconsistent dll linkage
        c:\b\build\slave\win_aura_builder\build\src\ash\test\test_system_tray_delegate.h(37) : see previous definition of 'GetUserLoginStatus'
c:\b\build\slave\win_aura_builder\build\src\ash\test\test_system_tray_delegate.cc(61) : warning C4273: 'ash::test::TestSystemTrayDelegate::ShouldShowDisplayNotification' : inconsistent dll linkage
        c:\b\build\slave\win_aura_builder\build\src\ash\test\test_system_tray_delegate.h(38) : see previous definition of 'ShouldShowDisplayNotification'
c:\b\build\slave\win_aura_builder\build\src\ash\test\test_system_tray_delegate.cc(65) : warning C4273: 'ash::test::TestSystemTrayDelegate::ShutDown' : inconsistent dll linkage
        c:\b\build\slave\win_aura_builder\build\src\ash\test\test_system_tray_delegate.h(39) : see previous definition of 'ShutDown'
c:\b\build\slave\win_aura_builder\build\src\ash\test\test_system_tray_delegate.cc(69) : warning C4273: 'ash::test::TestSystemTrayDelegate::SignOut' : inconsistent dll linkage
        c:\b\build\slave\win_aura_builder\build\src\ash\test\test_system_tray_delegate.h(40) : see previous definition of 'SignOut'
ninja: build stopped: subcommand failed.

> Refactors TestSystemTrayDelegate into DefaultSystemTrayDelegate
>
> 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
>
> Review URL: https://chromiumcodereview.appspot.com/23465018

TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/23650004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222973 0039d316-1c4b-4281-b951-d872f2087c98
17 files changed:
ash/ash.gyp
ash/shelf/shelf_widget.cc
ash/shell.cc
ash/shell/shell_delegate_impl.cc
ash/system/chromeos/managed/tray_locally_managed_user_unittest.cc
ash/system/chromeos/tray_display_unittest.cc
ash/system/tray/default_system_tray_delegate.cc [deleted file]
ash/system/tray/system_tray_delegate.cc
ash/system/tray/system_tray_delegate.h
ash/system/tray/test_system_tray_delegate.cc [new file with mode: 0644]
ash/system/tray/test_system_tray_delegate.h [moved from ash/system/tray/default_system_tray_delegate.h with 73% similarity]
ash/system/web_notification/web_notification_tray_unittest.cc
ash/test/ash_test_helper.cc
ash/test/test_shell_delegate.cc
ash/test/test_system_tray_delegate.cc [deleted file]
ash/test/test_system_tray_delegate.h [deleted file]
chrome/browser/ui/ash/chrome_shell_delegate_views.cc