| OLD | NEW |
| 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 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 | 252 |
| 253 // See class documentation for Widget in widget.h for a note about ownership. | 253 // See class documentation for Widget in widget.h for a note about ownership. |
| 254 Widget::InitParams::Ownership ownership_; | 254 Widget::InitParams::Ownership ownership_; |
| 255 | 255 |
| 256 scoped_ptr<DesktopCaptureClient> capture_client_; | 256 scoped_ptr<DesktopCaptureClient> capture_client_; |
| 257 | 257 |
| 258 // The following factory is used for calls to close the NativeWidgetAura | 258 // The following factory is used for calls to close the NativeWidgetAura |
| 259 // instance. | 259 // instance. |
| 260 base::WeakPtrFactory<DesktopNativeWidgetAura> close_widget_factory_; | 260 base::WeakPtrFactory<DesktopNativeWidgetAura> close_widget_factory_; |
| 261 | 261 |
| 262 // Can we be made active? | |
| 263 bool can_activate_; | |
| 264 | |
| 265 // Child of the root, contains |content_window_|. | 262 // Child of the root, contains |content_window_|. |
| 266 aura::Window* content_window_container_; | 263 aura::Window* content_window_container_; |
| 267 | 264 |
| 268 // Child of |content_window_container_|. This is the return value from | 265 // Child of |content_window_container_|. This is the return value from |
| 269 // GetNativeView(). | 266 // GetNativeView(). |
| 270 // WARNING: this may be NULL, in particular during shutdown it becomes NULL. | 267 // WARNING: this may be NULL, in particular during shutdown it becomes NULL. |
| 271 aura::Window* content_window_; | 268 aura::Window* content_window_; |
| 272 | 269 |
| 273 internal::NativeWidgetDelegate* native_widget_delegate_; | 270 internal::NativeWidgetDelegate* native_widget_delegate_; |
| 274 | 271 |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 | 314 |
| 318 // See class documentation for Widget in widget.h for a note about type. | 315 // See class documentation for Widget in widget.h for a note about type. |
| 319 Widget::InitParams::Type widget_type_; | 316 Widget::InitParams::Type widget_type_; |
| 320 | 317 |
| 321 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); | 318 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); |
| 322 }; | 319 }; |
| 323 | 320 |
| 324 } // namespace views | 321 } // namespace views |
| 325 | 322 |
| 326 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ | 323 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ |
| OLD | NEW |