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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.h

Issue 23702017: Ensure that the AURA focused window is set correctly when the window is activated. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura.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_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/activation_change_observer.h" 9 #include "ui/aura/client/activation_change_observer.h"
10 #include "ui/aura/client/activation_delegate.h" 10 #include "ui/aura/client/activation_delegate.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 corewm::CompoundEventFilter* root_window_event_filter() { 69 corewm::CompoundEventFilter* root_window_event_filter() {
70 return root_window_event_filter_; 70 return root_window_event_filter_;
71 } 71 }
72 72
73 // Invoked from DesktopRootWindowHost creation to create the CaptureClient. 73 // Invoked from DesktopRootWindowHost creation to create the CaptureClient.
74 void CreateCaptureClient(aura::RootWindow* root); 74 void CreateCaptureClient(aura::RootWindow* root);
75 75
76 // Overridden from NativeWidget: 76 // Overridden from NativeWidget:
77 virtual ui::EventHandler* GetEventHandler() OVERRIDE; 77 virtual ui::EventHandler* GetEventHandler() OVERRIDE;
78 78
79 // Ensures that the correct window is activated/deactivated based on whether
80 // we are being activated/deactivated.
81 void HandleActivationChanged(bool active);
82
79 protected: 83 protected:
80 // Overridden from internal::NativeWidgetPrivate: 84 // Overridden from internal::NativeWidgetPrivate:
81 virtual void InitNativeWidget(const Widget::InitParams& params) OVERRIDE; 85 virtual void InitNativeWidget(const Widget::InitParams& params) OVERRIDE;
82 virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE; 86 virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE;
83 virtual bool ShouldUseNativeFrame() const OVERRIDE; 87 virtual bool ShouldUseNativeFrame() const OVERRIDE;
84 virtual void FrameTypeChanged() OVERRIDE; 88 virtual void FrameTypeChanged() OVERRIDE;
85 virtual Widget* GetWidget() OVERRIDE; 89 virtual Widget* GetWidget() OVERRIDE;
86 virtual const Widget* GetWidget() const OVERRIDE; 90 virtual const Widget* GetWidget() const OVERRIDE;
87 virtual gfx::NativeView GetNativeView() const OVERRIDE; 91 virtual gfx::NativeView GetNativeView() const OVERRIDE;
88 virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE; 92 virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE;
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 // Reorders child windows of |window_| associated with a view based on the 269 // Reorders child windows of |window_| associated with a view based on the
266 // order of the associated views in the widget's view hierarchy. 270 // order of the associated views in the widget's view hierarchy.
267 scoped_ptr<WindowReorderer> window_reorderer_; 271 scoped_ptr<WindowReorderer> window_reorderer_;
268 272
269 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); 273 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
270 }; 274 };
271 275
272 } // namespace views 276 } // namespace views
273 277
274 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 278 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('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