diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-13 03:08:49 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-13 03:08:49 +0000 |
| commit | 39594f64142380e8ed8e06e10deb1396d0fa52dc (patch) | |
| tree | f91eff5d77bee32c6c8a8ee95a1a2e958e2a1c7c /chrome/browser/ui/ash/chrome_shell_delegate_views.cc | |
| parent | 8019cf950502180caa60a6cf7b52fc5934745e3f (diff) | |
| download | chromium_src-39594f64142380e8ed8e06e10deb1396d0fa52dc.zip chromium_src-39594f64142380e8ed8e06e10deb1396d0fa52dc.tar.gz chromium_src-39594f64142380e8ed8e06e10deb1396d0fa52dc.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/ui/ash/chrome_shell_delegate_views.cc')
| -rw-r--r-- | chrome/browser/ui/ash/chrome_shell_delegate_views.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc index 1b01998..c7075b2 100644 --- a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc +++ b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc @@ -6,7 +6,6 @@ #include "base/command_line.h" #include "ash/magnifier/magnifier_constants.h" -#include "ash/system/tray/default_system_tray_delegate.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profiles/profile_manager.h" @@ -104,8 +103,7 @@ void ChromeShellDelegate::SilenceSpokenFeedback() const { } ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() { - // TODO(sky): need to subclass and override Shutdown() in a meaningful way. - return new ash::DefaultSystemTrayDelegate; + return NULL; } ash::UserWallpaperDelegate* ChromeShellDelegate::CreateUserWallpaperDelegate() { |