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

Side by Side Diff: ui/views/widget/native_widget_aura.h

Issue 1151133003: Added an ActivationReason parameter to ActivationChangeObserver::OnWindowActivated(...). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Uploaded diff based on dependant CL. Created 5 years, 6 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 UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
7 7
8 #include "base/memory/scoped_vector.h" 8 #include "base/memory/scoped_vector.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "ui/aura/client/focus_change_observer.h" 10 #include "ui/aura/client/focus_change_observer.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 // Overridden from ui::EventHandler: 170 // Overridden from ui::EventHandler:
171 void OnKeyEvent(ui::KeyEvent* event) override; 171 void OnKeyEvent(ui::KeyEvent* event) override;
172 void OnMouseEvent(ui::MouseEvent* event) override; 172 void OnMouseEvent(ui::MouseEvent* event) override;
173 void OnScrollEvent(ui::ScrollEvent* event) override; 173 void OnScrollEvent(ui::ScrollEvent* event) override;
174 void OnGestureEvent(ui::GestureEvent* event) override; 174 void OnGestureEvent(ui::GestureEvent* event) override;
175 175
176 // Overridden from aura::client::ActivationDelegate: 176 // Overridden from aura::client::ActivationDelegate:
177 bool ShouldActivate() const override; 177 bool ShouldActivate() const override;
178 178
179 // Overridden from aura::client::ActivationChangeObserver: 179 // Overridden from aura::client::ActivationChangeObserver:
180 void OnWindowActivated(aura::Window* gained_active, 180 void OnWindowActivated(
181 aura::Window* lost_active) override; 181 aura::client::ActivationChangeObserver::ActivationReason reason,
182 aura::Window* gained_active,
183 aura::Window* lost_active) override;
182 184
183 // Overridden from aura::client::FocusChangeObserver: 185 // Overridden from aura::client::FocusChangeObserver:
184 void OnWindowFocused(aura::Window* gained_focus, 186 void OnWindowFocused(aura::Window* gained_focus,
185 aura::Window* lost_focus) override; 187 aura::Window* lost_focus) override;
186 188
187 // Overridden from aura::client::DragDropDelegate: 189 // Overridden from aura::client::DragDropDelegate:
188 void OnDragEntered(const ui::DropTargetEvent& event) override; 190 void OnDragEntered(const ui::DropTargetEvent& event) override;
189 int OnDragUpdated(const ui::DropTargetEvent& event) override; 191 int OnDragUpdated(const ui::DropTargetEvent& event) override;
190 void OnDragExited() override; 192 void OnDragExited() override;
191 int OnPerformDrop(const ui::DropTargetEvent& event) override; 193 int OnPerformDrop(const ui::DropTargetEvent& event) override;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 // The following factory is used for calls to close the NativeWidgetAura 232 // The following factory is used for calls to close the NativeWidgetAura
231 // instance. 233 // instance.
232 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_; 234 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_;
233 235
234 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura); 236 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
235 }; 237 };
236 238
237 } // namespace views 239 } // namespace views
238 240
239 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 241 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_native_widget_aura.cc ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698