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

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

Issue 23245012: Fix Views Combobox and Tree View text input. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address nit. 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
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_ROOT_WINDOW_HOST_X11_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_X11_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_X11_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_X11_H_
7 7
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 9
10 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. 10 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 virtual bool ShouldUseNativeFrame() OVERRIDE; 113 virtual bool ShouldUseNativeFrame() OVERRIDE;
114 virtual void FrameTypeChanged() OVERRIDE; 114 virtual void FrameTypeChanged() OVERRIDE;
115 virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE; 115 virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE;
116 virtual void SetFullscreen(bool fullscreen) OVERRIDE; 116 virtual void SetFullscreen(bool fullscreen) OVERRIDE;
117 virtual bool IsFullscreen() const OVERRIDE; 117 virtual bool IsFullscreen() const OVERRIDE;
118 virtual void SetOpacity(unsigned char opacity) OVERRIDE; 118 virtual void SetOpacity(unsigned char opacity) OVERRIDE;
119 virtual void SetWindowIcons(const gfx::ImageSkia& window_icon, 119 virtual void SetWindowIcons(const gfx::ImageSkia& window_icon,
120 const gfx::ImageSkia& app_icon) OVERRIDE; 120 const gfx::ImageSkia& app_icon) OVERRIDE;
121 virtual void InitModalType(ui::ModalType modal_type) OVERRIDE; 121 virtual void InitModalType(ui::ModalType modal_type) OVERRIDE;
122 virtual void FlashFrame(bool flash_frame) OVERRIDE; 122 virtual void FlashFrame(bool flash_frame) OVERRIDE;
123 virtual void OnNativeWidgetFocus() OVERRIDE;
124 virtual void OnNativeWidgetBlur() OVERRIDE;
125 123
126 // Overridden from aura::RootWindowHost: 124 // Overridden from aura::RootWindowHost:
127 virtual void SetDelegate(aura::RootWindowHostDelegate* delegate) OVERRIDE; 125 virtual void SetDelegate(aura::RootWindowHostDelegate* delegate) OVERRIDE;
128 virtual aura::RootWindow* GetRootWindow() OVERRIDE; 126 virtual aura::RootWindow* GetRootWindow() OVERRIDE;
129 virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE; 127 virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
130 virtual void Show() OVERRIDE; 128 virtual void Show() OVERRIDE;
131 virtual void Hide() OVERRIDE; 129 virtual void Hide() OVERRIDE;
132 virtual void ToggleFullScreen() OVERRIDE; 130 virtual void ToggleFullScreen() OVERRIDE;
133 virtual gfx::Rect GetBounds() const OVERRIDE; 131 virtual gfx::Rect GetBounds() const OVERRIDE;
134 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; 132 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 // A list of all (top-level) windows that have been created but not yet 255 // A list of all (top-level) windows that have been created but not yet
258 // destroyed. 256 // destroyed.
259 static std::list<XID>* open_windows_; 257 static std::list<XID>* open_windows_;
260 258
261 DISALLOW_COPY_AND_ASSIGN(DesktopRootWindowHostX11); 259 DISALLOW_COPY_AND_ASSIGN(DesktopRootWindowHostX11);
262 }; 260 };
263 261
264 } // namespace views 262 } // namespace views
265 263
266 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_X11_H_ 264 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_X11_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698