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

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

Issue 2227143003: mash: Move AutoHideEventHandler to WmShelfAura. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 4 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_layout_manager.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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 // ShelfBackgroundAnimatorObserver overrides: 99 // ShelfBackgroundAnimatorObserver overrides:
100 void UpdateShelfItemBackground(int alpha) override; 100 void UpdateShelfItemBackground(int alpha) override;
101 101
102 // ShelfLayoutManagerObserver overrides: 102 // ShelfLayoutManagerObserver overrides:
103 void WillDeleteShelfLayoutManager() override; 103 void WillDeleteShelfLayoutManager() override;
104 104
105 private: 105 private:
106 class DelegateView; 106 class DelegateView;
107 friend class DelegateView; 107 friend class DelegateView;
108 108
109 // views::Widget:
110 void OnMouseEvent(ui::MouseEvent* event) override;
111 void OnGestureEvent(ui::GestureEvent* event) override;
112
113 WmShelfAura* wm_shelf_aura_; 109 WmShelfAura* wm_shelf_aura_;
114 110
115 // Owned by the shelf container's aura::Window. 111 // Owned by the shelf container's aura::Window.
116 ShelfLayoutManager* shelf_layout_manager_; 112 ShelfLayoutManager* shelf_layout_manager_;
117 std::unique_ptr<Shelf> shelf_; 113 std::unique_ptr<Shelf> shelf_;
118 StatusAreaWidget* status_area_widget_; 114 StatusAreaWidget* status_area_widget_;
119 115
120 // |delegate_view_| is the contents view of this widget and is cleaned up 116 // |delegate_view_| is the contents view of this widget and is cleaned up
121 // during CloseChildWindows of the associated RootWindowController. 117 // during CloseChildWindows of the associated RootWindowController.
122 DelegateView* delegate_view_; 118 DelegateView* delegate_view_;
123 ShelfBackgroundAnimator background_animator_; 119 ShelfBackgroundAnimator background_animator_;
124 bool activating_as_fallback_; 120 bool activating_as_fallback_;
125 121
126 DISALLOW_COPY_AND_ASSIGN(ShelfWidget); 122 DISALLOW_COPY_AND_ASSIGN(ShelfWidget);
127 }; 123 };
128 124
129 } // namespace ash 125 } // namespace ash
130 126
131 #endif // ASH_SHELF_SHELF_WIDGET_H_ 127 #endif // ASH_SHELF_SHELF_WIDGET_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_layout_manager.cc ('k') | ash/shelf/shelf_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698