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

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

Issue 2204843003: mash: Move the shelf DimmerView out of shelf_widget.cc. (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
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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 void DisableDimmingAnimationsForTest(); 97 void DisableDimmingAnimationsForTest();
98 98
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;
James Cook 2016/08/03 03:09:11 Q: Which access needs the friend?
msw 2016/08/03 16:48:24 It passes |wm_shelf_aura_| to the DimmerView.
107 108
108 // views::Widget: 109 // views::Widget:
109 void OnMouseEvent(ui::MouseEvent* event) override; 110 void OnMouseEvent(ui::MouseEvent* event) override;
110 void OnGestureEvent(ui::GestureEvent* event) override; 111 void OnGestureEvent(ui::GestureEvent* event) override;
111 112
112 WmShelfAura* wm_shelf_aura_; 113 WmShelfAura* wm_shelf_aura_;
113 114
114 // Owned by the shelf container's aura::Window. 115 // Owned by the shelf container's aura::Window.
115 ShelfLayoutManager* shelf_layout_manager_; 116 ShelfLayoutManager* shelf_layout_manager_;
116 std::unique_ptr<Shelf> shelf_; 117 std::unique_ptr<Shelf> shelf_;
117 StatusAreaWidget* status_area_widget_; 118 StatusAreaWidget* status_area_widget_;
118 119
119 // |delegate_view_| is the contents view of this widget and is cleaned up 120 // |delegate_view_| is the contents view of this widget and is cleaned up
120 // during CloseChildWindows of the associated RootWindowController. 121 // during CloseChildWindows of the associated RootWindowController.
121 DelegateView* delegate_view_; 122 DelegateView* delegate_view_;
122 ShelfBackgroundAnimator background_animator_; 123 ShelfBackgroundAnimator background_animator_;
123 bool activating_as_fallback_; 124 bool activating_as_fallback_;
124 125
125 DISALLOW_COPY_AND_ASSIGN(ShelfWidget); 126 DISALLOW_COPY_AND_ASSIGN(ShelfWidget);
126 }; 127 };
127 128
128 } // namespace ash 129 } // namespace ash
129 130
130 #endif // ASH_SHELF_SHELF_WIDGET_H_ 131 #endif // ASH_SHELF_SHELF_WIDGET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698