projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
ui
/
views
/
widget
/
desktop_aura
/
x11_desktop_handler.h
diff --git
a/src/ui/views/widget/desktop_aura/x11_desktop_handler.h
b/src/ui/views/widget/desktop_aura/x11_desktop_handler.h
index
e97b68a
..
c704bba
100644
(file)
--- a/
src/ui/views/widget/desktop_aura/x11_desktop_handler.h
+++ b/
src/ui/views/widget/desktop_aura/x11_desktop_handler.h
@@
-57,12
+57,12
@@
class VIEWS_EXPORT X11DesktopHandler : public ui::PlatformEventDispatcher,
void ProcessXEvent(XEvent* event);
// ui::PlatformEventDispatcher
void ProcessXEvent(XEvent* event);
// ui::PlatformEventDispatcher
-
virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE
;
-
virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE
;
+
bool CanDispatchEvent(const ui::PlatformEvent& event) override
;
+
uint32_t DispatchEvent(const ui::PlatformEvent& event) override
;
// Overridden from aura::EnvObserver:
// Overridden from aura::EnvObserver:
- v
irtual void OnWindowInitialized(aura::Window* window) OVERRIDE
;
- v
irtual void OnWillDestroyEnv() OVERRIDE
;
+ v
oid OnWindowInitialized(aura::Window* window) override
;
+ v
oid OnWillDestroyEnv() override
;
private:
enum ActiveState {
private:
enum ActiveState {
@@
-71,7
+71,7
@@
class VIEWS_EXPORT X11DesktopHandler : public ui::PlatformEventDispatcher,
};
X11DesktopHandler();
};
X11DesktopHandler();
-
virtual ~X11DesktopHandler()
;
+
~X11DesktopHandler() override
;
// Handles changes in activation.
void OnActiveWindowChanged(::Window window, ActiveState active_state);
// Handles changes in activation.
void OnActiveWindowChanged(::Window window, ActiveState active_state);