Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1174)

Unified Diff: ui/aura_shell/shell.h

Issue 8591003: aura: Fix Chrome OS status area browser tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add include Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura_shell/shelf_layout_controller.cc ('k') | ui/aura_shell/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « ui/aura_shell/shelf_layout_controller.cc ('k') | ui/aura_shell/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698