| Index: ui/aura_shell/shell.h
|
| diff --git a/ui/aura_shell/shell.h b/ui/aura_shell/shell.h
|
| index 75643c558c75ae3b6aa2cb766d880dd1f484b804..26ed93cfba428b802760ed70834e52dc87b83756 100644
|
| --- a/ui/aura_shell/shell.h
|
| +++ b/ui/aura_shell/shell.h
|
| @@ -23,6 +23,9 @@ class Window;
|
| namespace gfx {
|
| class Rect;
|
| }
|
| +namespace views {
|
| +class Widget;
|
| +}
|
|
|
| namespace aura_shell {
|
|
|
| @@ -50,6 +53,9 @@ class AURA_SHELL_EXPORT Shell {
|
|
|
| static void DeleteInstanceForTesting();
|
|
|
| + ShellDelegate* delegate() { return delegate_.get(); }
|
| + Launcher* launcher() { return launcher_.get(); }
|
| +
|
| aura::Window* GetContainer(int container_id);
|
| const aura::Window* GetContainer(int container_id) const;
|
|
|
| @@ -60,8 +66,7 @@ class AURA_SHELL_EXPORT Shell {
|
| // Toggles between overview mode and normal mode.
|
| void ToggleOverview();
|
|
|
| - ShellDelegate* delegate() { return delegate_.get(); }
|
| - Launcher* launcher() { return launcher_.get(); }
|
| + views::Widget* GetStatusAreaWidget();
|
|
|
| private:
|
| typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;
|
|
|