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

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

Issue 2243513004: mash: Partially migrate WorkspaceController to ash common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test failures and crashes. 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"
11 #include "ash/common/shelf/shelf_background_animator.h" 11 #include "ash/common/shelf/shelf_background_animator.h"
12 #include "ash/common/shelf/shelf_background_animator_observer.h" 12 #include "ash/common/shelf/shelf_background_animator_observer.h"
13 #include "ash/common/shelf/shelf_types.h" 13 #include "ash/common/shelf/shelf_types.h"
14 #include "ash/shelf/shelf_layout_manager_observer.h" 14 #include "ash/shelf/shelf_layout_manager_observer.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "ui/views/widget/widget.h" 16 #include "ui/views/widget/widget.h"
17 #include "ui/views/widget/widget_observer.h" 17 #include "ui/views/widget/widget_observer.h"
18 18
19 namespace ash { 19 namespace ash {
20 class FocusCycler; 20 class FocusCycler;
21 class Shelf; 21 class Shelf;
22 class ShelfLayoutManager; 22 class ShelfLayoutManager;
23 class StatusAreaWidget; 23 class StatusAreaWidget;
24 class WmShelfAura; 24 class WmShelfAura;
25 class WmWindow; 25 class WmWindow;
26 class WorkspaceController;
27 26
28 class ASH_EXPORT ShelfWidget : public views::Widget, 27 class ASH_EXPORT ShelfWidget : public views::Widget,
29 public views::WidgetObserver, 28 public views::WidgetObserver,
30 public ShelfBackgroundAnimatorObserver, 29 public ShelfBackgroundAnimatorObserver,
31 public ShelfLayoutManagerObserver { 30 public ShelfLayoutManagerObserver {
32 public: 31 public:
33 ShelfWidget(WmWindow* shelf_container, 32 ShelfWidget(WmWindow* shelf_container,
34 WmWindow* status_container, 33 WmWindow* status_container,
35 WmShelfAura* wm_shelf_aura, 34 WmShelfAura* wm_shelf_aura);
James Cook 2016/08/11 23:27:35 so nice to have fewer dependencies
msw 2016/08/12 00:17:15 Acknowledged.
36 WorkspaceController* workspace_controller);
37 ~ShelfWidget() override; 35 ~ShelfWidget() override;
38 36
39 // Returns if shelf alignment option is enabled, and the user is able to 37 // Returns if shelf alignment option is enabled, and the user is able to
40 // adjust the alignment (guest and supervised mode users cannot for example). 38 // adjust the alignment (guest and supervised mode users cannot for example).
41 static bool ShelfAlignmentAllowed(); 39 static bool ShelfAlignmentAllowed();
42 40
43 void OnShelfAlignmentChanged(); 41 void OnShelfAlignmentChanged();
44 ShelfAlignment GetAlignment() const; 42 ShelfAlignment GetAlignment() const;
45 43
46 // Sets the shelf's background type. 44 // Sets the shelf's background type.
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 DelegateView* delegate_view_; 116 DelegateView* delegate_view_;
119 ShelfBackgroundAnimator background_animator_; 117 ShelfBackgroundAnimator background_animator_;
120 bool activating_as_fallback_; 118 bool activating_as_fallback_;
121 119
122 DISALLOW_COPY_AND_ASSIGN(ShelfWidget); 120 DISALLOW_COPY_AND_ASSIGN(ShelfWidget);
123 }; 121 };
124 122
125 } // namespace ash 123 } // namespace ash
126 124
127 #endif // ASH_SHELF_SHELF_WIDGET_H_ 125 #endif // ASH_SHELF_SHELF_WIDGET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698