| Index: ui/aura_shell/shell.h
|
| diff --git a/ui/aura_shell/shell.h b/ui/aura_shell/shell.h
|
| index 228c00f430d1a5510aa0af9f5edc1be4927997a5..53a3c3b48b01a96330f498fed1f0b8e183908f2c 100644
|
| --- a/ui/aura_shell/shell.h
|
| +++ b/ui/aura_shell/shell.h
|
| @@ -29,6 +29,7 @@ namespace aura_shell {
|
| class Launcher;
|
| class ShellAcceleratorController;
|
| class ShellDelegate;
|
| +class ShellTooltipManager;
|
|
|
| namespace internal {
|
| class AppList;
|
| @@ -72,6 +73,10 @@ class AURA_SHELL_EXPORT Shell {
|
| return accelerator_controller_.get();
|
| }
|
|
|
| + ShellTooltipManager* tooltip_manager() {
|
| + return tooltip_manager_.get();
|
| + }
|
| +
|
| ShellDelegate* delegate() { return delegate_.get(); }
|
| Launcher* launcher() { return launcher_.get(); }
|
|
|
| @@ -113,6 +118,8 @@ class AURA_SHELL_EXPORT Shell {
|
| // An event filter that pre-handles global accelerators.
|
| scoped_ptr<internal::ShellAcceleratorFilter> accelerator_filter_;
|
|
|
| + scoped_ptr<ShellTooltipManager> tooltip_manager_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(Shell);
|
| };
|
|
|
|
|