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

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

Issue 2267183002: ash: Remove unnecessary utility methods from ash::Shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits 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_unittest.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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 ShelfLayoutManager* shelf_layout_manager() { return shelf_layout_manager_; } 65 ShelfLayoutManager* shelf_layout_manager() { return shelf_layout_manager_; }
66 StatusAreaWidget* status_area_widget() const { return status_area_widget_; } 66 StatusAreaWidget* status_area_widget() const { return status_area_widget_; }
67 67
68 ShelfView* CreateShelfView(); 68 ShelfView* CreateShelfView();
69 void PostCreateShelf(); 69 void PostCreateShelf();
70 70
71 // Set visibility of the shelf. 71 // Set visibility of the shelf.
72 void SetShelfVisibility(bool visible); 72 void SetShelfVisibility(bool visible);
73 bool IsShelfVisible() const; 73 bool IsShelfVisible() const;
74 74
75 bool IsShowingContextMenu() const;
76
77 bool IsShowingOverflowBubble() const;
78
75 // Sets the focus cycler. Also adds the shelf to the cycle. 79 // Sets the focus cycler. Also adds the shelf to the cycle.
76 void SetFocusCycler(FocusCycler* focus_cycler); 80 void SetFocusCycler(FocusCycler* focus_cycler);
77 FocusCycler* GetFocusCycler(); 81 FocusCycler* GetFocusCycler();
78 82
79 // Called by the activation delegate, before the shelf is activated 83 // Called by the activation delegate, before the shelf is activated
80 // when no other windows are visible. 84 // when no other windows are visible.
81 void WillActivateAsFallback() { activating_as_fallback_ = true; } 85 void WillActivateAsFallback() { activating_as_fallback_ = true; }
82 86
83 // Clean up prior to deletion. 87 // Clean up prior to deletion.
84 void Shutdown(); 88 void Shutdown();
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 ShelfView* shelf_view_; 129 ShelfView* shelf_view_;
126 ShelfBackgroundAnimator background_animator_; 130 ShelfBackgroundAnimator background_animator_;
127 bool activating_as_fallback_; 131 bool activating_as_fallback_;
128 132
129 DISALLOW_COPY_AND_ASSIGN(ShelfWidget); 133 DISALLOW_COPY_AND_ASSIGN(ShelfWidget);
130 }; 134 };
131 135
132 } // namespace ash 136 } // namespace ash
133 137
134 #endif // ASH_SHELF_SHELF_WIDGET_H_ 138 #endif // ASH_SHELF_SHELF_WIDGET_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_unittest.cc ('k') | ash/shelf/shelf_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698