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

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: rebase 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
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shelf/shelf_widget.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
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: 98 // ShelfLayoutManagerObserver overrides:
99 void WillDeleteShelfLayoutManager() override; 99 void WillDeleteShelfLayoutManager() override;
100 100
101 private: 101 private:
102 class DelegateView; 102 class DelegateView;
103 103
104 // views::Widget:
105 void OnMouseEvent(ui::MouseEvent* event) override;
106 void OnGestureEvent(ui::GestureEvent* event) override;
107
104 // Owned by the shelf container's aura::Window. 108 // Owned by the shelf container's aura::Window.
105 ShelfLayoutManager* shelf_layout_manager_; 109 ShelfLayoutManager* shelf_layout_manager_;
106 std::unique_ptr<Shelf> shelf_; 110 std::unique_ptr<Shelf> shelf_;
107 StatusAreaWidget* status_area_widget_; 111 StatusAreaWidget* status_area_widget_;
108 112
109 // delegate_view_ is attached to window_container_ and is cleaned up 113 // delegate_view_ is attached to window_container_ and is cleaned up
110 // during CloseChildWindows of the associated RootWindowController. 114 // during CloseChildWindows of the associated RootWindowController.
111 DelegateView* delegate_view_; 115 DelegateView* delegate_view_;
112 BackgroundAnimator background_animator_; 116 BackgroundAnimator background_animator_;
113 bool activating_as_fallback_; 117 bool activating_as_fallback_;
114 aura::Window* window_container_; 118 aura::Window* window_container_;
115 }; 119 };
116 120
117 } // namespace ash 121 } // namespace ash
118 122
119 #endif // ASH_SHELF_SHELF_WIDGET_H_ 123 #endif // ASH_SHELF_SHELF_WIDGET_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shelf/shelf_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698