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

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

Issue 13994014: Force refresh of shelf area when gesture completes to prevent (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: ws & ll Created 7 years, 8 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 "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/shelf/background_animator.h" 9 #include "ash/shelf/background_animator.h"
10 #include "ash/shelf/shelf_types.h" 10 #include "ash/shelf/shelf_types.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 void ForceUndimming(bool force); 84 void ForceUndimming(bool force);
85 85
86 // Overridden from views::WidgetObserver: 86 // Overridden from views::WidgetObserver:
87 virtual void OnWidgetActivationChanged( 87 virtual void OnWidgetActivationChanged(
88 views::Widget* widget, bool active) OVERRIDE; 88 views::Widget* widget, bool active) OVERRIDE;
89 89
90 // A function to test the current alpha used by the dimming bar. If there is 90 // A function to test the current alpha used by the dimming bar. If there is
91 // no dimmer active, the function will return -1. 91 // no dimmer active, the function will return -1.
92 int GetDimmingAlphaForTest(); 92 int GetDimmingAlphaForTest();
93 93
94 // A function to test the bounds of the dimming bar. Returns gfx::Rect() if
95 // the dimmer is inactive.
96 gfx::Rect GetDimmerBoundsForTest();
97
94 // Disable dimming animations for running tests. 98 // Disable dimming animations for running tests.
95 void DisableDimmingAnimationsForTest(); 99 void DisableDimmingAnimationsForTest();
96 100
97 private: 101 private:
98 class DelegateView; 102 class DelegateView;
99 103
100 internal::ShelfLayoutManager* shelf_layout_manager_; 104 internal::ShelfLayoutManager* shelf_layout_manager_;
101 scoped_ptr<Launcher> launcher_; 105 scoped_ptr<Launcher> launcher_;
102 internal::StatusAreaWidget* status_area_widget_; 106 internal::StatusAreaWidget* status_area_widget_;
103 107
104 // delegate_view_ is attached to window_container_ and is cleaned up 108 // delegate_view_ is attached to window_container_ and is cleaned up
105 // during CloseChildWindows of the associated RootWindowController. 109 // during CloseChildWindows of the associated RootWindowController.
106 DelegateView* delegate_view_; 110 DelegateView* delegate_view_;
107 internal::BackgroundAnimator background_animator_; 111 internal::BackgroundAnimator background_animator_;
108 bool activating_as_fallback_; 112 bool activating_as_fallback_;
109 aura::Window* window_container_; 113 aura::Window* window_container_;
110 }; 114 };
111 115
112 } // namespace ash 116 } // namespace ash
113 117
114 #endif // ASH_SHELF_SHELF_WIDGET_H_ 118 #endif // ASH_SHELF_SHELF_WIDGET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698