Index: ui/aura_shell/shell.h |
diff --git a/ui/aura_shell/shell.h b/ui/aura_shell/shell.h |
index 159e96b05b09f9f0a3c04f823ad47d8a33296368..c2378612df956989fe987029766a98424a0abe90 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 { |
@@ -52,6 +55,12 @@ class AURA_SHELL_EXPORT Shell { |
static void DeleteInstanceForTesting(); |
+ ShellAcceleratorController* accelerator_controller() { |
+ return accelerator_controller_.get(); |
+ } |
+ ShellDelegate* delegate() { return delegate_.get(); } |
+ Launcher* launcher() { return launcher_.get(); } |
+ |
aura::Window* GetContainer(int container_id); |
const aura::Window* GetContainer(int container_id) const; |
@@ -62,11 +71,7 @@ class AURA_SHELL_EXPORT Shell { |
// Toggles between overview mode and normal mode. |
void ToggleOverview(); |
- ShellAcceleratorController* accelerator_controller() { |
- return accelerator_controller_.get(); |
- } |
- ShellDelegate* delegate() { return delegate_.get(); } |
- Launcher* launcher() { return launcher_.get(); } |
+ views::Widget* GetStatusAreaWidget(); |
Ben Goodger (Google)
2011/11/18 20:31:17
Add ForTesting() to the method name, so that it's
|
private: |
typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair; |