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

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

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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_view_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 "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_layout_manager_observer.h" 10 #include "ash/shelf/shelf_layout_manager_observer.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 aura::Window* window_container() { return window_container_; } 75 aura::Window* window_container() { return window_container_; }
76 76
77 // TODO(harrym): Remove when Status Area Widget is a child view. 77 // TODO(harrym): Remove when Status Area Widget is a child view.
78 void ShutdownStatusAreaWidget(); 78 void ShutdownStatusAreaWidget();
79 79
80 // Force the shelf to be presented in an undimmed state. 80 // Force the shelf to be presented in an undimmed state.
81 void ForceUndimming(bool force); 81 void ForceUndimming(bool force);
82 82
83 // Overridden from views::WidgetObserver: 83 // Overridden from views::WidgetObserver:
84 virtual void OnWidgetActivationChanged( 84 virtual void OnWidgetActivationChanged(
85 views::Widget* widget, bool active) OVERRIDE; 85 views::Widget* widget, bool active) override;
86 86
87 // A function to test the current alpha used by the dimming bar. If there is 87 // A function to test the current alpha used by the dimming bar. If there is
88 // no dimmer active, the function will return -1. 88 // no dimmer active, the function will return -1.
89 int GetDimmingAlphaForTest(); 89 int GetDimmingAlphaForTest();
90 90
91 // A function to test the bounds of the dimming bar. Returns gfx::Rect() if 91 // A function to test the bounds of the dimming bar. Returns gfx::Rect() if
92 // the dimmer is inactive. 92 // the dimmer is inactive.
93 gfx::Rect GetDimmerBoundsForTest(); 93 gfx::Rect GetDimmerBoundsForTest();
94 94
95 // Disable dimming animations for running tests. 95 // Disable dimming animations for running tests.
96 void DisableDimmingAnimationsForTest(); 96 void DisableDimmingAnimationsForTest();
97 97
98 // ShelfLayoutManagerObserver overrides: 98 // ShelfLayoutManagerObserver overrides:
99 virtual void WillDeleteShelf() OVERRIDE; 99 virtual void WillDeleteShelf() override;
100 100
101 private: 101 private:
102 class DelegateView; 102 class DelegateView;
103 103
104 ShelfLayoutManager* shelf_layout_manager_; 104 ShelfLayoutManager* shelf_layout_manager_;
105 scoped_ptr<Shelf> shelf_; 105 scoped_ptr<Shelf> shelf_;
106 StatusAreaWidget* status_area_widget_; 106 StatusAreaWidget* status_area_widget_;
107 107
108 // delegate_view_ is attached to window_container_ and is cleaned up 108 // delegate_view_ is attached to window_container_ and is cleaned up
109 // during CloseChildWindows of the associated RootWindowController. 109 // during CloseChildWindows of the associated RootWindowController.
110 DelegateView* delegate_view_; 110 DelegateView* delegate_view_;
111 BackgroundAnimator background_animator_; 111 BackgroundAnimator background_animator_;
112 bool activating_as_fallback_; 112 bool activating_as_fallback_;
113 aura::Window* window_container_; 113 aura::Window* window_container_;
114 }; 114 };
115 115
116 } // namespace ash 116 } // namespace ash
117 117
118 #endif // ASH_SHELF_SHELF_WIDGET_H_ 118 #endif // ASH_SHELF_SHELF_WIDGET_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shelf/shelf_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698