Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / shell / content_client / shell_browser_main_parts.cc

diff --git a/src/ash/shell/content_client/shell_browser_main_parts.cc b/src/ash/shell/content_client/shell_browser_main_parts.cc
index 6cdc114..a7a7c57 100644 (file)
--- a/src/ash/shell/content_client/shell_browser_main_parts.cc
+++ b/src/ash/shell/content_client/shell_browser_main_parts.cc
@@ -34,7 +34,7 @@
 #include "ui/wm/core/wm_state.h"
 
 #if defined(USE_X11)
-#include "ui/events/x/touch_factory_x11.h"
+#include "ui/events/devices/x11/touch_factory_x11.h"
 #endif
 
 #if defined(OS_CHROMEOS)
@@ -51,16 +51,16 @@ namespace {
 class ShellViewsDelegate : public views::TestViewsDelegate {
  public:
   ShellViewsDelegate() {}
-  virtual ~ShellViewsDelegate() {}
+  ~ShellViewsDelegate() override {}
 
   // Overridden from views::TestViewsDelegate:
-  virtual views::NonClientFrameView* CreateDefaultNonClientFrameView(
-      views::Widget* widget) OVERRIDE {
+  views::NonClientFrameView* CreateDefaultNonClientFrameView(
+      views::Widget* widget) override {
     return ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(widget);
   }
-  virtual void OnBeforeWidgetInit(
+  void OnBeforeWidgetInit(
       views::Widget::InitParams* params,
-      views::internal::NativeWidgetDelegate* delegate) OVERRIDE {
+      views::internal::NativeWidgetDelegate* delegate) override {
     if (params->opacity == views::Widget::InitParams::INFER_OPACITY)
       params->opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;