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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_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_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
7 7
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "ui/aura/client/focus_change_observer.h" 9 #include "ui/aura/client/focus_change_observer.h"
10 #include "ui/aura/window_delegate.h" 10 #include "ui/aura/window_delegate.h"
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 // Overridden from ui::EventHandler: 206 // Overridden from ui::EventHandler:
207 void OnKeyEvent(ui::KeyEvent* event) override; 207 void OnKeyEvent(ui::KeyEvent* event) override;
208 void OnMouseEvent(ui::MouseEvent* event) override; 208 void OnMouseEvent(ui::MouseEvent* event) override;
209 void OnScrollEvent(ui::ScrollEvent* event) override; 209 void OnScrollEvent(ui::ScrollEvent* event) override;
210 void OnGestureEvent(ui::GestureEvent* event) override; 210 void OnGestureEvent(ui::GestureEvent* event) override;
211 211
212 // Overridden from aura::client::ActivationDelegate: 212 // Overridden from aura::client::ActivationDelegate:
213 bool ShouldActivate() const override; 213 bool ShouldActivate() const override;
214 214
215 // Overridden from aura::client::ActivationChangeObserver: 215 // Overridden from aura::client::ActivationChangeObserver:
216 void OnWindowActivated(aura::Window* gained_active, 216 void OnWindowActivated(
217 aura::Window* lost_active) override; 217 aura::client::ActivationChangeObserver::ActivationReason reason,
218 aura::Window* gained_active,
219 aura::Window* lost_active) override;
218 220
219 // Overridden from aura::client::FocusChangeObserver: 221 // Overridden from aura::client::FocusChangeObserver:
220 void OnWindowFocused(aura::Window* gained_focus, 222 void OnWindowFocused(aura::Window* gained_focus,
221 aura::Window* lost_focus) override; 223 aura::Window* lost_focus) override;
222 224
223 // Overridden from views::internal::InputMethodDelegate: 225 // Overridden from views::internal::InputMethodDelegate:
224 void DispatchKeyEventPostIME(const ui::KeyEvent& key) override; 226 void DispatchKeyEventPostIME(const ui::KeyEvent& key) override;
225 227
226 // Overridden from aura::client::DragDropDelegate: 228 // Overridden from aura::client::DragDropDelegate:
227 void OnDragEntered(const ui::DropTargetEvent& event) override; 229 void OnDragEntered(const ui::DropTargetEvent& event) override;
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 // The following factory is used for calls to close the NativeWidgetAura 317 // The following factory is used for calls to close the NativeWidgetAura
316 // instance. 318 // instance.
317 base::WeakPtrFactory<DesktopNativeWidgetAura> close_widget_factory_; 319 base::WeakPtrFactory<DesktopNativeWidgetAura> close_widget_factory_;
318 320
319 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); 321 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
320 }; 322 };
321 323
322 } // namespace views 324 } // namespace views
323 325
324 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 326 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « ui/views/controls/menu/menu_message_loop_aura.cc ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698