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

Side by Side Diff: ui/app_list/views/app_list_view.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 | « ui/app_list/views/app_list_main_view_unittest.cc ('k') | ui/app_list/views/app_list_view.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 UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_
6 #define UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/observer_list.h" 10 #include "base/observer_list.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 void UpdateBounds(); 83 void UpdateBounds();
84 84
85 // Enables/disables a semi-transparent overlay over the app list (good for 85 // Enables/disables a semi-transparent overlay over the app list (good for
86 // hiding the app list when a modal dialog is being shown). 86 // hiding the app list when a modal dialog is being shown).
87 void SetAppListOverlayVisible(bool visible); 87 void SetAppListOverlayVisible(bool visible);
88 88
89 // Returns true if the app list should be centered and in landscape mode. 89 // Returns true if the app list should be centered and in landscape mode.
90 bool ShouldCenterWindow() const; 90 bool ShouldCenterWindow() const;
91 91
92 // Overridden from views::View: 92 // Overridden from views::View:
93 virtual gfx::Size GetPreferredSize() const OVERRIDE; 93 virtual gfx::Size GetPreferredSize() const override;
94 virtual void Paint(gfx::Canvas* canvas, 94 virtual void Paint(gfx::Canvas* canvas,
95 const views::CullSet& cull_set) OVERRIDE; 95 const views::CullSet& cull_set) override;
96 virtual void OnThemeChanged() OVERRIDE; 96 virtual void OnThemeChanged() override;
97 97
98 // WidgetDelegate overrides: 98 // WidgetDelegate overrides:
99 virtual bool ShouldHandleSystemCommands() const OVERRIDE; 99 virtual bool ShouldHandleSystemCommands() const override;
100 100
101 // Overridden from AppListViewDelegateObserver: 101 // Overridden from AppListViewDelegateObserver:
102 virtual void OnProfilesChanged() OVERRIDE; 102 virtual void OnProfilesChanged() override;
103 virtual void OnShutdown() OVERRIDE; 103 virtual void OnShutdown() override;
104 104
105 void Prerender(); 105 void Prerender();
106 106
107 void SetProfileByPath(const base::FilePath& profile_path); 107 void SetProfileByPath(const base::FilePath& profile_path);
108 108
109 void AddObserver(AppListViewObserver* observer); 109 void AddObserver(AppListViewObserver* observer);
110 void RemoveObserver(AppListViewObserver* observer); 110 void RemoveObserver(AppListViewObserver* observer);
111 111
112 // Set a callback to be called the next time any app list paints. 112 // Set a callback to be called the next time any app list paints.
113 void SetNextPaintCallback(const base::Closure& callback); 113 void SetNextPaintCallback(const base::Closure& callback);
(...skipping 12 matching lines...) Expand all
126 126
127 void InitAsBubbleInternal(gfx::NativeView parent, 127 void InitAsBubbleInternal(gfx::NativeView parent,
128 int initial_apps_page, 128 int initial_apps_page,
129 views::BubbleBorder::Arrow arrow, 129 views::BubbleBorder::Arrow arrow,
130 bool border_accepts_events, 130 bool border_accepts_events,
131 const gfx::Vector2d& anchor_offset); 131 const gfx::Vector2d& anchor_offset);
132 132
133 // Overridden from views::BubbleDelegateView: 133 // Overridden from views::BubbleDelegateView:
134 virtual void OnBeforeBubbleWidgetInit( 134 virtual void OnBeforeBubbleWidgetInit(
135 views::Widget::InitParams* params, 135 views::Widget::InitParams* params,
136 views::Widget* widget) const OVERRIDE; 136 views::Widget* widget) const override;
137 137
138 // Overridden from views::WidgetDelegateView: 138 // Overridden from views::WidgetDelegateView:
139 virtual views::View* GetInitiallyFocusedView() OVERRIDE; 139 virtual views::View* GetInitiallyFocusedView() override;
140 virtual gfx::ImageSkia GetWindowIcon() OVERRIDE; 140 virtual gfx::ImageSkia GetWindowIcon() override;
141 virtual bool WidgetHasHitTestMask() const OVERRIDE; 141 virtual bool WidgetHasHitTestMask() const override;
142 virtual void GetWidgetHitTestMask(gfx::Path* mask) const OVERRIDE; 142 virtual void GetWidgetHitTestMask(gfx::Path* mask) const override;
143 143
144 // Overridden from views::View: 144 // Overridden from views::View:
145 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; 145 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
146 virtual void Layout() OVERRIDE; 146 virtual void Layout() override;
147 virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE; 147 virtual void SchedulePaintInRect(const gfx::Rect& rect) override;
148 148
149 // Overridden from views::WidgetObserver: 149 // Overridden from views::WidgetObserver:
150 virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; 150 virtual void OnWidgetDestroying(views::Widget* widget) override;
151 virtual void OnWidgetVisibilityChanged( 151 virtual void OnWidgetVisibilityChanged(
152 views::Widget* widget, bool visible) OVERRIDE; 152 views::Widget* widget, bool visible) override;
153 virtual void OnWidgetActivationChanged( 153 virtual void OnWidgetActivationChanged(
154 views::Widget* widget, bool active) OVERRIDE; 154 views::Widget* widget, bool active) override;
155 155
156 // Overridden from SpeechUIModelObserver: 156 // Overridden from SpeechUIModelObserver:
157 virtual void OnSpeechRecognitionStateChanged( 157 virtual void OnSpeechRecognitionStateChanged(
158 SpeechRecognitionState new_state) OVERRIDE; 158 SpeechRecognitionState new_state) override;
159 159
160 AppListViewDelegate* delegate_; // Weak. Owned by AppListService. 160 AppListViewDelegate* delegate_; // Weak. Owned by AppListService.
161 161
162 AppListMainView* app_list_main_view_; 162 AppListMainView* app_list_main_view_;
163 SpeechView* speech_view_; 163 SpeechView* speech_view_;
164 164
165 // The red "experimental" banner for the experimental app list. 165 // The red "experimental" banner for the experimental app list.
166 views::ImageView* experimental_banner_view_; 166 views::ImageView* experimental_banner_view_;
167 167
168 // A semi-transparent white overlay that covers the app list while dialogs are 168 // A semi-transparent white overlay that covers the app list while dialogs are
169 // open. 169 // open.
170 views::View* overlay_view_; 170 views::View* overlay_view_;
171 171
172 ObserverList<AppListViewObserver> observers_; 172 ObserverList<AppListViewObserver> observers_;
173 scoped_ptr<HideViewAnimationObserver> animation_observer_; 173 scoped_ptr<HideViewAnimationObserver> animation_observer_;
174 174
175 // For UMA and testing. If non-null, triggered when the app list is painted. 175 // For UMA and testing. If non-null, triggered when the app list is painted.
176 base::Closure next_paint_callback_; 176 base::Closure next_paint_callback_;
177 177
178 DISALLOW_COPY_AND_ASSIGN(AppListView); 178 DISALLOW_COPY_AND_ASSIGN(AppListView);
179 }; 179 };
180 180
181 } // namespace app_list 181 } // namespace app_list
182 182
183 #endif // UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ 183 #endif // UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/app_list_main_view_unittest.cc ('k') | ui/app_list/views/app_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698