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

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

Issue 2072023003: mash: Break ash system tray dependencies on ash::ShelfWidget (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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/root_window_controller.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 12 matching lines...) Expand all
23 class WmShelfAura; 23 class WmShelfAura;
24 class WmWindow; 24 class WmWindow;
25 class WorkspaceController; 25 class WorkspaceController;
26 26
27 class ASH_EXPORT ShelfWidget : public views::Widget, 27 class ASH_EXPORT ShelfWidget : public views::Widget,
28 public views::WidgetObserver, 28 public views::WidgetObserver,
29 public ShelfLayoutManagerObserver { 29 public ShelfLayoutManagerObserver {
30 public: 30 public:
31 ShelfWidget(WmWindow* wm_shelf_container, 31 ShelfWidget(WmWindow* wm_shelf_container,
32 WmWindow* wm_status_container, 32 WmWindow* wm_status_container,
33 WmShelfAura* wm_shelf_aura,
33 WorkspaceController* workspace_controller); 34 WorkspaceController* workspace_controller);
34 ~ShelfWidget() override; 35 ~ShelfWidget() override;
35 36
36 // 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
37 // adjust the alignment (guest and supervised mode users cannot for example). 38 // adjust the alignment (guest and supervised mode users cannot for example).
38 static bool ShelfAlignmentAllowed(); 39 static bool ShelfAlignmentAllowed();
39 40
40 void OnShelfAlignmentChanged(); 41 void OnShelfAlignmentChanged();
41 ShelfAlignment GetAlignment() const; 42 ShelfAlignment GetAlignment() const;
42 43
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 DelegateView* delegate_view_; 114 DelegateView* delegate_view_;
114 BackgroundAnimator background_animator_; 115 BackgroundAnimator background_animator_;
115 bool activating_as_fallback_; 116 bool activating_as_fallback_;
116 117
117 DISALLOW_COPY_AND_ASSIGN(ShelfWidget); 118 DISALLOW_COPY_AND_ASSIGN(ShelfWidget);
118 }; 119 };
119 120
120 } // namespace ash 121 } // namespace ash
121 122
122 #endif // ASH_SHELF_SHELF_WIDGET_H_ 123 #endif // ASH_SHELF_SHELF_WIDGET_H_
OLDNEW
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shelf/shelf_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698