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

Unified Diff: ui/aura_shell/shelf_layout_controller.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
Index: ui/aura_shell/shelf_layout_controller.h
diff --git a/ui/aura_shell/shelf_layout_controller.h b/ui/aura_shell/shelf_layout_controller.h
index a675699e5e1fa67c97d914d01ba41c82802e4c39..6ea62f1f831a70f1a25ce8e88149ccfc3cbb6a26 100644
--- a/ui/aura_shell/shelf_layout_controller.h
+++ b/ui/aura_shell/shelf_layout_controller.h
@@ -23,10 +23,12 @@ namespace internal {
// status area as well as positioning them.
class ShelfLayoutController : public ui::LayerAnimationObserver {
public:
- ShelfLayoutController(views::Widget* launcher,
- views::Widget* status);
+ ShelfLayoutController(views::Widget* launcher_widget,
+ views::Widget* status_widget);
virtual ~ShelfLayoutController();
+ views::Widget* status_widget() { return status_widget_; }
+
// Stops any animations and sets the bounds of the launcher and status
// widgets.
void LayoutShelf();
@@ -71,8 +73,8 @@ class ShelfLayoutController : public ui::LayerAnimationObserver {
// Max height needed.
int max_height_;
- views::Widget* launcher_;
- views::Widget* status_;
+ views::Widget* launcher_widget_;
+ views::Widget* status_widget_;
DISALLOW_COPY_AND_ASSIGN(ShelfLayoutController);
};

Powered by Google App Engine
This is Rietveld 408576698