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

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: typo Created 4 years, 7 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 // A function to test the bounds of the dimming bar. Returns gfx::Rect() if 89 // A function to test the bounds of the dimming bar. Returns gfx::Rect() if
90 // the dimmer is inactive. 90 // the dimmer is inactive.
91 gfx::Rect GetDimmerBoundsForTest(); 91 gfx::Rect GetDimmerBoundsForTest();
92 92
93 // Disable dimming animations for running tests. 93 // Disable dimming animations for running tests.
94 void DisableDimmingAnimationsForTest(); 94 void DisableDimmingAnimationsForTest();
95 95
96 private: 96 private:
97 class DelegateView; 97 class DelegateView;
98 98
99 // views::Widget:
100 void OnMouseEvent(ui::MouseEvent* event) override;
101 void OnGestureEvent(ui::GestureEvent* event) override;
102
99 // Owned by the shelf container's aura::Window. 103 // Owned by the shelf container's aura::Window.
100 ShelfLayoutManager* shelf_layout_manager_; 104 ShelfLayoutManager* shelf_layout_manager_;
101 std::unique_ptr<Shelf> shelf_; 105 std::unique_ptr<Shelf> shelf_;
102 StatusAreaWidget* status_area_widget_; 106 StatusAreaWidget* status_area_widget_;
103 107
104 // delegate_view_ is attached to window_container_ and is cleaned up 108 // delegate_view_ is attached to window_container_ and is cleaned up
105 // during CloseChildWindows of the associated RootWindowController. 109 // during CloseChildWindows of the associated RootWindowController.
106 DelegateView* delegate_view_; 110 DelegateView* delegate_view_;
107 BackgroundAnimator background_animator_; 111 BackgroundAnimator background_animator_;
108 bool activating_as_fallback_; 112 bool activating_as_fallback_;
109 aura::Window* window_container_; 113 aura::Window* window_container_;
110 }; 114 };
111 115
112 } // namespace ash 116 } // namespace ash
113 117
114 #endif // ASH_SHELF_SHELF_WIDGET_H_ 118 #endif // ASH_SHELF_SHELF_WIDGET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698