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

Side by Side Diff: ash/shelf/shelf_widget.h

Issue 2007003002: mash: Preliminary support for shelf auto-hide (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shutdown
Patch Set: cleanup Created 4 years, 6 months 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SHELF_SHELF_WIDGET_H_ 5 #ifndef ASH_SHELF_SHELF_WIDGET_H_
6 #define ASH_SHELF_SHELF_WIDGET_H_ 6 #define ASH_SHELF_SHELF_WIDGET_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 // no dimmer active, the function will return -1. 88 // no dimmer active, the function will return -1.
89 int GetDimmingAlphaForTest(); 89 int GetDimmingAlphaForTest();
90 90
91 // A function to test the bounds of the dimming bar. Returns gfx::Rect() if 91 // A function to test the bounds of the dimming bar. Returns gfx::Rect() if
92 // the dimmer is inactive. 92 // the dimmer is inactive.
93 gfx::Rect GetDimmerBoundsForTest(); 93 gfx::Rect GetDimmerBoundsForTest();
94 94
95 // Disable dimming animations for running tests. 95 // Disable dimming animations for running tests.
96 void DisableDimmingAnimationsForTest(); 96 void DisableDimmingAnimationsForTest();
97 97
98 // ShelfLayoutManagerObserver overrides:
99 void WillDeleteShelf() override;
100
101 private: 98 private:
102 class DelegateView; 99 class DelegateView;
103 100
101 // views::Widget:
102 void OnMouseEvent(ui::MouseEvent* event) override;
103 void OnGestureEvent(ui::GestureEvent* event) override;
104
105 // ShelfLayoutManagerObserver:
106 void WillDeleteShelf() override;
107
104 ShelfLayoutManager* shelf_layout_manager_; 108 ShelfLayoutManager* shelf_layout_manager_;
105 std::unique_ptr<Shelf> shelf_; 109 std::unique_ptr<Shelf> shelf_;
106 StatusAreaWidget* status_area_widget_; 110 StatusAreaWidget* status_area_widget_;
107 111
108 // delegate_view_ is attached to window_container_ and is cleaned up 112 // delegate_view_ is attached to window_container_ and is cleaned up
109 // during CloseChildWindows of the associated RootWindowController. 113 // during CloseChildWindows of the associated RootWindowController.
110 DelegateView* delegate_view_; 114 DelegateView* delegate_view_;
111 BackgroundAnimator background_animator_; 115 BackgroundAnimator background_animator_;
112 bool activating_as_fallback_; 116 bool activating_as_fallback_;
113 aura::Window* window_container_; 117 aura::Window* window_container_;
114 }; 118 };
115 119
116 } // namespace ash 120 } // namespace ash
117 121
118 #endif // ASH_SHELF_SHELF_WIDGET_H_ 122 #endif // ASH_SHELF_SHELF_WIDGET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698