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

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

Issue 173803002: Redesigns the text input focus handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Synced. Created 6 years, 9 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
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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 virtual void ReorderNativeViews() OVERRIDE; 113 virtual void ReorderNativeViews() OVERRIDE;
114 virtual void ViewRemoved(View* view) OVERRIDE; 114 virtual void ViewRemoved(View* view) OVERRIDE;
115 virtual void SetNativeWindowProperty(const char* name, void* value) OVERRIDE; 115 virtual void SetNativeWindowProperty(const char* name, void* value) OVERRIDE;
116 virtual void* GetNativeWindowProperty(const char* name) const OVERRIDE; 116 virtual void* GetNativeWindowProperty(const char* name) const OVERRIDE;
117 virtual TooltipManager* GetTooltipManager() const OVERRIDE; 117 virtual TooltipManager* GetTooltipManager() const OVERRIDE;
118 virtual void SetCapture() OVERRIDE; 118 virtual void SetCapture() OVERRIDE;
119 virtual void ReleaseCapture() OVERRIDE; 119 virtual void ReleaseCapture() OVERRIDE;
120 virtual bool HasCapture() const OVERRIDE; 120 virtual bool HasCapture() const OVERRIDE;
121 virtual InputMethod* CreateInputMethod() OVERRIDE; 121 virtual InputMethod* CreateInputMethod() OVERRIDE;
122 virtual internal::InputMethodDelegate* GetInputMethodDelegate() OVERRIDE; 122 virtual internal::InputMethodDelegate* GetInputMethodDelegate() OVERRIDE;
123 virtual ui::InputMethod* GetHostInputMethod() OVERRIDE;
123 virtual void CenterWindow(const gfx::Size& size) OVERRIDE; 124 virtual void CenterWindow(const gfx::Size& size) OVERRIDE;
124 virtual void GetWindowPlacement( 125 virtual void GetWindowPlacement(
125 gfx::Rect* bounds, 126 gfx::Rect* bounds,
126 ui::WindowShowState* maximized) const OVERRIDE; 127 ui::WindowShowState* maximized) const OVERRIDE;
127 virtual bool SetWindowTitle(const base::string16& title) OVERRIDE; 128 virtual bool SetWindowTitle(const base::string16& title) OVERRIDE;
128 virtual void SetWindowIcons(const gfx::ImageSkia& window_icon, 129 virtual void SetWindowIcons(const gfx::ImageSkia& window_icon,
129 const gfx::ImageSkia& app_icon) OVERRIDE; 130 const gfx::ImageSkia& app_icon) OVERRIDE;
130 virtual void InitModalType(ui::ModalType modal_type) OVERRIDE; 131 virtual void InitModalType(ui::ModalType modal_type) OVERRIDE;
131 virtual gfx::Rect GetWindowBoundsInScreen() const OVERRIDE; 132 virtual gfx::Rect GetWindowBoundsInScreen() const OVERRIDE;
132 virtual gfx::Rect GetClientAreaBoundsInScreen() const OVERRIDE; 133 virtual gfx::Rect GetClientAreaBoundsInScreen() const OVERRIDE;
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 int last_drop_operation_; 291 int last_drop_operation_;
291 292
292 scoped_ptr<corewm::TooltipController> tooltip_controller_; 293 scoped_ptr<corewm::TooltipController> tooltip_controller_;
293 scoped_ptr<TooltipManagerAura> tooltip_manager_; 294 scoped_ptr<TooltipManagerAura> tooltip_manager_;
294 295
295 scoped_ptr<views::corewm::VisibilityController> visibility_controller_; 296 scoped_ptr<views::corewm::VisibilityController> visibility_controller_;
296 297
297 scoped_ptr<views::corewm::WindowModalityController> 298 scoped_ptr<views::corewm::WindowModalityController>
298 window_modality_controller_; 299 window_modality_controller_;
299 300
300 // See comments in OnLostActive().
301 bool restore_focus_on_activate_; 301 bool restore_focus_on_activate_;
302 302
303 gfx::NativeCursor cursor_; 303 gfx::NativeCursor cursor_;
304 // We must manually reference count the number of users of |cursor_manager_| 304 // We must manually reference count the number of users of |cursor_manager_|
305 // because the cursors created by |cursor_manager_| are shared among the 305 // because the cursors created by |cursor_manager_| are shared among the
306 // DNWAs. We can't just stuff this in a LazyInstance because we need to 306 // DNWAs. We can't just stuff this in a LazyInstance because we need to
307 // destroy this as the last DNWA happens; we can't put it off until 307 // destroy this as the last DNWA happens; we can't put it off until
308 // (potentially) after we tear down the X11 connection because that's a 308 // (potentially) after we tear down the X11 connection because that's a
309 // crash. 309 // crash.
310 static int cursor_reference_count_; 310 static int cursor_reference_count_;
311 static views::corewm::CursorManager* cursor_manager_; 311 static views::corewm::CursorManager* cursor_manager_;
312 static views::DesktopNativeCursorManager* native_cursor_manager_; 312 static views::DesktopNativeCursorManager* native_cursor_manager_;
313 313
314 scoped_ptr<corewm::ShadowController> shadow_controller_; 314 scoped_ptr<corewm::ShadowController> shadow_controller_;
315 315
316 // Reorders child windows of |window_| associated with a view based on the 316 // Reorders child windows of |window_| associated with a view based on the
317 // order of the associated views in the widget's view hierarchy. 317 // order of the associated views in the widget's view hierarchy.
318 scoped_ptr<WindowReorderer> window_reorderer_; 318 scoped_ptr<WindowReorderer> window_reorderer_;
319 319
320 // See class documentation for Widget in widget.h for a note about type. 320 // See class documentation for Widget in widget.h for a note about type.
321 Widget::InitParams::Type widget_type_; 321 Widget::InitParams::Type widget_type_;
322 322
323 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); 323 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
324 }; 324 };
325 325
326 } // namespace views 326 } // namespace views
327 327
328 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 328 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698