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/shell/shell_delegate_impl.cc | |
| 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/shell/shell_delegate_impl.cc')
| -rw-r--r-- | ash/shell/shell_delegate_impl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc index 471f5ac..58076ab 100644 --- a/ash/shell/shell_delegate_impl.cc +++ b/ash/shell/shell_delegate_impl.cc @@ -16,6 +16,7 @@ #include "ash/shell/launcher_delegate_impl.h" #include "ash/shell/toplevel_window.h" #include "ash/shell_window_ids.h" +#include "ash/system/tray/default_system_tray_delegate.h" #include "ash/wm/window_util.h" #include "base/message_loop/message_loop.h" #include "ui/aura/window.h" @@ -168,7 +169,7 @@ ash::LauncherDelegate* ShellDelegateImpl::CreateLauncherDelegate( } ash::SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate() { - return NULL; + return new DefaultSystemTrayDelegate; } ash::UserWallpaperDelegate* ShellDelegateImpl::CreateUserWallpaperDelegate() { |