Moving notification types which are chrome specific to a new header file chrome_notification_type...

chrome/browser/renderer_host/render_widget_host_view_views_touch.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
 
 #include "base/logging.h"
 #include "chrome/browser/renderer_host/accelerated_surface_container_touch.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.h"
 #include "ui/gfx/gl/gl_bindings.h"
 #include "views/widget/widget.h"
 
 static const char kRenderWidgetHostViewKey[] = "__RENDER_WIDGET_HOST_VIEW__";
 
 using WebKit::WebInputEventFactory;
 using WebKit::WebTouchEvent;
 
 namespace {
 
-WebKit::WebTouchPoint::State TouchPointStateFromEvent(
+WebKit::WebTouchPocontent::NOTIFICATION_State TouchPointStateFromEvent(
     const views::TouchEvent* event) {
   switch (event->type()) {
     case ui::ET_TOUCH_PRESSED:
-      return WebKit::WebTouchPoint::StatePressed;
+      return WebKit::WebTouchPocontent::NOTIFICATION_StatePressed;
     case ui::ET_TOUCH_RELEASED:
-      return WebKit::WebTouchPoint::StateReleased;
+      return WebKit::WebTouchPocontent::NOTIFICATION_StateReleased;
     case ui::ET_TOUCH_MOVED:
-      return WebKit::WebTouchPoint::StateMoved;
+      return WebKit::WebTouchPocontent::NOTIFICATION_StateMoved;
     case ui::ET_TOUCH_CANCELLED:
-      return WebKit::WebTouchPoint::StateCancelled;
+      return WebKit::WebTouchPocontent::NOTIFICATION_StateCancelled;
     default:
-      return WebKit::WebTouchPoint::StateUndefined;
+      return WebKit::WebTouchPocontent::NOTIFICATION_StateUndefined;
   }
 }
 
 WebKit::WebInputEvent::Type TouchEventTypeFromEvent(
     const views::TouchEvent* event) {
   switch (event->type()) {
     case ui::ET_TOUCH_PRESSED:
       return WebKit::WebInputEvent::TouchStart;
     case ui::ET_TOUCH_RELEASED:
       return WebKit::WebInputEvent::TouchEnd;
@@ skipping 87 matching lines @@
   if (!point)
     return ui::TOUCH_STATUS_UNKNOWN;
 
   if (status != ui::TOUCH_STATUS_START)
     status = ui::TOUCH_STATUS_CONTINUE;
 
   UpdateTouchParams(event, point);
 
   // Update the location and state of the point.
   point->state = TouchPointStateFromEvent(&event);
-  if (point->state == WebKit::WebTouchPoint::StateMoved) {
+  if (point->state == WebKit::WebTouchPocontent::NOTIFICATION_StateMoved) {
     // It is possible for badly written touch drivers to emit Move events even
     // when the touch location hasn't changed. In such cases, consume the event
     // and pretend nothing happened.
     if (point->position.x == event.x() && point->position.y == event.y()) {
       return status;
     }
   }
   UpdateTouchPointPosition(&event, GetMirroredPosition(), point);
 
   // Mark the rest of the points as stationary.
   for (int i = 0; i < touch_event_.touchPointsLength; ++i) {
     WebKit::WebTouchPoint* iter = touch_event_.touchPoints + i;
     if (iter != point) {
-      iter->state = WebKit::WebTouchPoint::StateStationary;
+      iter->state = WebKit::WebTouchPocontent::NOTIFICATION_StateStationary;
     }
   }
 
   // Update the type of the touch event.
   touch_event_.type = TouchEventTypeFromEvent(&event);
   touch_event_.timeStampSeconds = base::Time::Now().ToDoubleT();
 
   // The event and all the touches have been updated. Dispatch.
   host_->ForwardTouchEvent(touch_event_);
 
@@ skipping 42 matching lines @@
 
 void RenderWidgetHostViewViews::AcceleratedSurfaceRelease(uint64 surface_id) {
   accelerated_surface_containers_.erase(surface_id);
 }
 
 void RenderWidgetHostViewViews::AcceleratedSurfaceBuffersSwapped(
     uint64 surface_id) {
   SetExternalTexture(accelerated_surface_containers_[surface_id].get());
   glFlush();
 }