Merge WebWidgetClient into WebViewClient.

sky/engine/web/AssertMatchingEnums.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 52 matching lines @@
 #include "sky/engine/public/web/WebConsoleMessage.h"
 #include "sky/engine/public/web/WebFontDescription.h"
 #include "sky/engine/public/web/WebNavigationPolicy.h"
 #include "sky/engine/public/web/WebNavigatorContentUtilsClient.h"
 #include "sky/engine/public/web/WebNode.h"
 #include "sky/engine/public/web/WebSettings.h"
 #include "sky/engine/public/web/WebTextAffinity.h"
 #include "sky/engine/public/web/WebTextCheckingResult.h"
 #include "sky/engine/public/web/WebTextCheckingType.h"
 #include "sky/engine/public/web/WebTextDecorationType.h"
-#include "sky/engine/public/web/WebTouchAction.h"
 #include "sky/engine/public/web/WebView.h"
 #include "sky/engine/wtf/Assertions.h"
 #include "sky/engine/wtf/text/StringImpl.h"
 
 namespace blink {
 
 #define COMPILE_ASSERT_MATCHING_ENUM(public_name, core_name) \
     COMPILE_ASSERT(int(public_name) == int(core_name), mismatching_enums)
 
 #define COMPILE_ASSERT_MATCHING_UINT64(public_name, core_name) \
@@ skipping 117 matching lines @@
 COMPILE_ASSERT_MATCHING_ENUM(WebNavigationPolicyNewForegroundTab, NavigationPolicyNewForegroundTab);
 COMPILE_ASSERT_MATCHING_ENUM(WebNavigationPolicyNewWindow, NavigationPolicyNewWindow);
 COMPILE_ASSERT_MATCHING_ENUM(WebNavigationPolicyNewPopup, NavigationPolicyNewPopup);
 
 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelDebug, DebugMessageLevel);
 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelLog, LogMessageLevel);
 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelWarning, WarningMessageLevel);
 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelError, ErrorMessageLevel);
 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelInfo, InfoMessageLevel);
 
-COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionNone, TouchActionNone);
-COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionAuto, TouchActionAuto);
-COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionPanX, TouchActionPanX);
-COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionPanY, TouchActionPanY);
-COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionPinchZoom, TouchActionPinchZoom);
-
 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::V8CacheOptionsOff, V8CacheOptionsOff);
 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::V8CacheOptionsParse, V8CacheOptionsParse);
 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::V8CacheOptionsCode, V8CacheOptionsCode);
 
 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::PointerTypeNone, PointerTypeNone);
 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::PointerTypeCoarse, PointerTypeCoarse);
 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::PointerTypeFine, PointerTypeFine);
 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::HoverTypeNone, HoverTypeNone);
 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::HoverTypeOnDemand, HoverTypeOnDemand);
 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::HoverTypeHover, HoverTypeHover);
 
 } // namespace blink