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

Side by Side Diff: ui/views/controls/native/native_view_host_aura.h

Issue 397493005: Make NativeViewHostAura clipping window non-focusable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix use-after-free in WebContentsViewAura destructor Created 6 years, 5 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 | « no previous file | ui/views/controls/native/native_view_host_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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_CONTROLS_NATIVE_NATIVE_VIEW_HOST_AURA_H_ 5 #ifndef UI_VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_AURA_H_
6 #define UI_VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_AURA_H_ 6 #define UI_VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_AURA_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
(...skipping 22 matching lines...) Expand all
33 virtual void UninstallClip() OVERRIDE; 33 virtual void UninstallClip() OVERRIDE;
34 virtual void ShowWidget(int x, int y, int w, int h) OVERRIDE; 34 virtual void ShowWidget(int x, int y, int w, int h) OVERRIDE;
35 virtual void HideWidget() OVERRIDE; 35 virtual void HideWidget() OVERRIDE;
36 virtual void SetFocus() OVERRIDE; 36 virtual void SetFocus() OVERRIDE;
37 virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE; 37 virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE;
38 virtual gfx::NativeCursor GetCursor(int x, int y) OVERRIDE; 38 virtual gfx::NativeCursor GetCursor(int x, int y) OVERRIDE;
39 39
40 private: 40 private:
41 friend class NativeViewHostAuraTest; 41 friend class NativeViewHostAuraTest;
42 42
43 class ClippingWindowDelegate;
44
43 // Overridden from aura::WindowObserver: 45 // Overridden from aura::WindowObserver:
46 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
44 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; 47 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
45 48
46 // Reparents the native view with the clipping window existing between it and 49 // Reparents the native view with the clipping window existing between it and
47 // its old parent, so that the fast resize path works. 50 // its old parent, so that the fast resize path works.
48 void AddClippingWindow(); 51 void AddClippingWindow();
49 52
50 // If the native view has been reparented via AddClippingWindow, this call 53 // If the native view has been reparented via AddClippingWindow, this call
51 // undoes it. 54 // undoes it.
52 void RemoveClippingWindow(); 55 void RemoveClippingWindow();
53 56
54 // Our associated NativeViewHost. 57 // Our associated NativeViewHost.
55 NativeViewHost* host_; 58 NativeViewHost* host_;
56 59
60 scoped_ptr<ClippingWindowDelegate> clipping_window_delegate_;
61
57 // Window that exists between the native view and the parent that allows for 62 // Window that exists between the native view and the parent that allows for
58 // clipping to occur. This is positioned in the coordinate space of 63 // clipping to occur. This is positioned in the coordinate space of
59 // host_->GetWidget(). 64 // host_->GetWidget().
60 aura::Window clipping_window_; 65 aura::Window clipping_window_;
61 scoped_ptr<gfx::Rect> clip_rect_; 66 scoped_ptr<gfx::Rect> clip_rect_;
62 67
63 DISALLOW_COPY_AND_ASSIGN(NativeViewHostAura); 68 DISALLOW_COPY_AND_ASSIGN(NativeViewHostAura);
64 }; 69 };
65 70
66 } // namespace views 71 } // namespace views
67 72
68 #endif // UI_VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_AURA_H_ 73 #endif // UI_VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | ui/views/controls/native/native_view_host_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698