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

Unified Diff: ash/common/shelf/shelf_widget.h

Issue 2550413004: Remove Ash shelf dimmer. (Closed)
Patch Set: jamescook review Created 4 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/shelf/shelf_view.cc ('k') | ash/common/shelf/shelf_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/shelf_widget.h
diff --git a/ash/common/shelf/shelf_widget.h b/ash/common/shelf/shelf_widget.h
index 5650a71c76a9b2b9f94ee2aac4c9bd9ace97546b..688a1c7898903566677105811b32ace0a3458195 100644
--- a/ash/common/shelf/shelf_widget.h
+++ b/ash/common/shelf/shelf_widget.h
@@ -54,10 +54,6 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
void HideShelfBehindBlackBar(bool hide, int animation_time_ms);
bool IsShelfHiddenBehindBlackBar() const;
- // Causes shelf items to be slightly dimmed (e.g. when a window is maximized).
- void SetDimsShelf(bool dimming);
- bool GetDimsShelf() const;
-
ShelfLayoutManager* shelf_layout_manager() { return shelf_layout_manager_; }
StatusAreaWidget* status_area_widget() const { return status_area_widget_; }
@@ -83,9 +79,6 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
// Clean up prior to deletion.
void Shutdown();
- // Force the shelf to be presented in an undimmed state.
- void ForceUndimming(bool force);
-
// See WmShelf::UpdateIconPositionForPanel().
void UpdateIconPositionForPanel(WmWindow* panel);
@@ -101,17 +94,6 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
// Overridden from views::WidgetObserver:
void OnWidgetActivationChanged(views::Widget* widget, bool active) override;
- // A function to test the current alpha used by the dimming bar. If there is
- // no dimmer active, the function will return -1.
- int GetDimmingAlphaForTest();
-
- // A function to test the bounds of the dimming bar. Returns gfx::Rect() if
- // the dimmer is inactive.
- gfx::Rect GetDimmerBoundsForTest();
-
- // Disable dimming animations for running tests.
- void DisableDimmingAnimationsForTest();
-
// ShelfBackgroundAnimatorObserver overrides:
void UpdateShelfItemBackground(int alpha) override;
« no previous file with comments | « ash/common/shelf/shelf_view.cc ('k') | ash/common/shelf/shelf_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698