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

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

Issue 403853002: Revert 284177 "Make NativeViewHostAura clipping window non-focus..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | trunk/src/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
45 // Overridden from aura::WindowObserver: 43 // Overridden from aura::WindowObserver:
46 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; 44 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
47 45
48 // Reparents the native view with the clipping window existing between it and 46 // Reparents the native view with the clipping window existing between it and
49 // its old parent, so that the fast resize path works. 47 // its old parent, so that the fast resize path works.
50 void AddClippingWindow(); 48 void AddClippingWindow();
51 49
52 // If the native view has been reparented via AddClippingWindow, this call 50 // If the native view has been reparented via AddClippingWindow, this call
53 // undoes it. 51 // undoes it.
54 void RemoveClippingWindow(); 52 void RemoveClippingWindow();
55 53
56 // Our associated NativeViewHost. 54 // Our associated NativeViewHost.
57 NativeViewHost* host_; 55 NativeViewHost* host_;
58 56
59 scoped_ptr<ClippingWindowDelegate> clipping_window_delegate_;
60
61 // Window that exists between the native view and the parent that allows for 57 // Window that exists between the native view and the parent that allows for
62 // clipping to occur. This is positioned in the coordinate space of 58 // clipping to occur. This is positioned in the coordinate space of
63 // host_->GetWidget(). 59 // host_->GetWidget().
64 aura::Window clipping_window_; 60 aura::Window clipping_window_;
65 scoped_ptr<gfx::Rect> clip_rect_; 61 scoped_ptr<gfx::Rect> clip_rect_;
66 62
67 DISALLOW_COPY_AND_ASSIGN(NativeViewHostAura); 63 DISALLOW_COPY_AND_ASSIGN(NativeViewHostAura);
68 }; 64 };
69 65
70 } // namespace views 66 } // namespace views
71 67
72 #endif // UI_VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_AURA_H_ 68 #endif // UI_VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | trunk/src/ui/views/controls/native/native_view_host_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698