Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / desktop_background / desktop_background_view.cc

diff --git a/src/ash/desktop_background/desktop_background_view.cc b/src/ash/desktop_background/desktop_background_view.cc
index 1c6f6db..c87b4fd 100644 (file)
--- a/src/ash/desktop_background/desktop_background_view.cc
+++ b/src/ash/desktop_background/desktop_background_view.cc
@@ -49,7 +49,7 @@ class LayerControlView : public views::View {
   }
 
   // Overrides views::View.
-  virtual void Layout() OVERRIDE {
+  void Layout() override {
     gfx::Display display = Shell::GetScreen()->GetDisplayNearestWindow(
         GetWidget()->GetNativeView());
     DisplayManager* display_manager = Shell::GetInstance()->display_manager();
@@ -79,11 +79,11 @@ class LayerControlView : public views::View {
 class PreEventDispatchHandler : public ui::EventHandler {
  public:
   PreEventDispatchHandler() {}
-  virtual ~PreEventDispatchHandler() {}
+  ~PreEventDispatchHandler() override {}
 
  private:
   // ui::EventHandler:
-  virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
+  void OnMouseEvent(ui::MouseEvent* event) override {
     CHECK_EQ(ui::EP_PRETARGET, event->phase());
     WindowSelectorController* controller =
         Shell::GetInstance()->window_selector_controller();
@@ -93,7 +93,7 @@ class PreEventDispatchHandler : public ui::EventHandler {
     }
   }
 
-  virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
+  void OnGestureEvent(ui::GestureEvent* event) override {
     CHECK_EQ(ui::EP_PRETARGET, event->phase());
     WindowSelectorController* controller =
         Shell::GetInstance()->window_selector_controller();