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

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

Issue 2209803004: mash: Move ShelfWindowTargeter out of shelf_widget.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. 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/ash.gyp ('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 StatusAreaWidget; 23 class StatusAreaWidget;
24 class WmShelfAura; 24 class WmShelfAura;
25 class WmWindow; 25 class WmWindow;
26 class WorkspaceController; 26 class WorkspaceController;
27 27
28 class ASH_EXPORT ShelfWidget : public views::Widget, 28 class ASH_EXPORT ShelfWidget : public views::Widget,
29 public views::WidgetObserver, 29 public views::WidgetObserver,
30 public ShelfBackgroundAnimatorObserver, 30 public ShelfBackgroundAnimatorObserver,
31 public ShelfLayoutManagerObserver { 31 public ShelfLayoutManagerObserver {
32 public: 32 public:
33 ShelfWidget(WmWindow* wm_shelf_container, 33 ShelfWidget(WmWindow* shelf_container,
34 WmWindow* wm_status_container, 34 WmWindow* status_container,
35 WmShelfAura* wm_shelf_aura, 35 WmShelfAura* wm_shelf_aura,
36 WorkspaceController* workspace_controller); 36 WorkspaceController* workspace_controller);
37 ~ShelfWidget() override; 37 ~ShelfWidget() override;
38 38
39 // Returns if shelf alignment option is enabled, and the user is able to 39 // 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). 40 // adjust the alignment (guest and supervised mode users cannot for example).
41 static bool ShelfAlignmentAllowed(); 41 static bool ShelfAlignmentAllowed();
42 42
43 void OnShelfAlignmentChanged(); 43 void OnShelfAlignmentChanged();
44 ShelfAlignment GetAlignment() const; 44 ShelfAlignment GetAlignment() const;
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 DelegateView* delegate_view_; 122 DelegateView* delegate_view_;
123 ShelfBackgroundAnimator background_animator_; 123 ShelfBackgroundAnimator background_animator_;
124 bool activating_as_fallback_; 124 bool activating_as_fallback_;
125 125
126 DISALLOW_COPY_AND_ASSIGN(ShelfWidget); 126 DISALLOW_COPY_AND_ASSIGN(ShelfWidget);
127 }; 127 };
128 128
129 } // namespace ash 129 } // namespace ash
130 130
131 #endif // ASH_SHELF_SHELF_WIDGET_H_ 131 #endif // ASH_SHELF_SHELF_WIDGET_H_
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/shelf/shelf_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698