summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/css_colors.h4
-rw-r--r--chrome/common/db_message_filter.cc2
-rw-r--r--chrome/common/desktop_notifications/active_notification_tracker.cc4
-rw-r--r--chrome/common/desktop_notifications/active_notification_tracker.h2
-rw-r--r--chrome/common/native_web_keyboard_event.h2
-rw-r--r--chrome/common/native_web_keyboard_event_linux.cc2
-rw-r--r--chrome/common/native_web_keyboard_event_mac.mm2
-rw-r--r--chrome/common/native_web_keyboard_event_win.cc2
-rw-r--r--chrome/common/plugin_messages.h4
-rw-r--r--chrome/common/webkit_param_traits.h20
-rw-r--r--chrome/common/webmessageportchannel_impl.cc4
-rw-r--r--chrome/common/webmessageportchannel_impl.h2
12 files changed, 25 insertions, 25 deletions
diff --git a/chrome/common/css_colors.h b/chrome/common/css_colors.h
index 994a3907..d952e98 100644
--- a/chrome/common/css_colors.h
+++ b/chrome/common/css_colors.h
@@ -8,8 +8,8 @@
#include <utility>
#include "base/basictypes.h"
-#include "webkit/api/public/WebColor.h"
-#include "webkit/api/public/WebColorName.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebColor.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebColorName.h"
// Functionality related to sending the values of CSS colors to the renderer.
class CSSColors {
diff --git a/chrome/common/db_message_filter.cc b/chrome/common/db_message_filter.cc
index 939c6e8..a3e6bd8 100644
--- a/chrome/common/db_message_filter.cc
+++ b/chrome/common/db_message_filter.cc
@@ -6,7 +6,7 @@
#include "chrome/common/child_process.h"
#include "chrome/common/render_messages.h"
-#include "webkit/api/public/WebDatabase.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h"
DBMessageFilter* DBMessageFilter::instance_ = NULL;
diff --git a/chrome/common/desktop_notifications/active_notification_tracker.cc b/chrome/common/desktop_notifications/active_notification_tracker.cc
index 230d76a..3357ab3 100644
--- a/chrome/common/desktop_notifications/active_notification_tracker.cc
+++ b/chrome/common/desktop_notifications/active_notification_tracker.cc
@@ -5,8 +5,8 @@
#include "chrome/common/desktop_notifications/active_notification_tracker.h"
#include "base/message_loop.h"
-#include "webkit/api/public/WebNotification.h"
-#include "webkit/api/public/WebNotificationPermissionCallback.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebNotification.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebNotificationPermissionCallback.h"
using WebKit::WebNotification;
using WebKit::WebNotificationPermissionCallback;
diff --git a/chrome/common/desktop_notifications/active_notification_tracker.h b/chrome/common/desktop_notifications/active_notification_tracker.h
index 4bdd5d9..b25c42e 100644
--- a/chrome/common/desktop_notifications/active_notification_tracker.h
+++ b/chrome/common/desktop_notifications/active_notification_tracker.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/id_map.h"
#include "base/hash_tables.h"
-#include "webkit/api/public/WebNotification.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebNotification.h"
namespace WebKit {
class WebNotificationPermissionCallback;
diff --git a/chrome/common/native_web_keyboard_event.h b/chrome/common/native_web_keyboard_event.h
index 654c38b..4edf0e2 100644
--- a/chrome/common/native_web_keyboard_event.h
+++ b/chrome/common/native_web_keyboard_event.h
@@ -6,7 +6,7 @@
#define CHROME_COMMON_NATIVE_WEB_KEYBOARD_EVENT_H_
#include "base/basictypes.h"
-#include "webkit/api/public/WebInputEvent.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
#if defined(OS_WIN)
#include <windows.h>
diff --git a/chrome/common/native_web_keyboard_event_linux.cc b/chrome/common/native_web_keyboard_event_linux.cc
index 6df2290..3daeb47 100644
--- a/chrome/common/native_web_keyboard_event_linux.cc
+++ b/chrome/common/native_web_keyboard_event_linux.cc
@@ -4,7 +4,7 @@
#include "chrome/common/native_web_keyboard_event.h"
-#include "webkit/api/public/gtk/WebInputEventFactory.h"
+#include "third_party/WebKit/WebKit/chromium/public/gtk/WebInputEventFactory.h"
using WebKit::WebInputEventFactory;
diff --git a/chrome/common/native_web_keyboard_event_mac.mm b/chrome/common/native_web_keyboard_event_mac.mm
index 59e0ace..0c11033 100644
--- a/chrome/common/native_web_keyboard_event_mac.mm
+++ b/chrome/common/native_web_keyboard_event_mac.mm
@@ -6,7 +6,7 @@
#import <AppKit/AppKit.h>
-#include "webkit/api/public/mac/WebInputEventFactory.h"
+#include "third_party/WebKit/WebKit/chromium/public/mac/WebInputEventFactory.h"
using WebKit::WebInputEventFactory;
diff --git a/chrome/common/native_web_keyboard_event_win.cc b/chrome/common/native_web_keyboard_event_win.cc
index b98f28b..a2ba45f 100644
--- a/chrome/common/native_web_keyboard_event_win.cc
+++ b/chrome/common/native_web_keyboard_event_win.cc
@@ -4,7 +4,7 @@
#include "chrome/common/native_web_keyboard_event.h"
-#include "webkit/api/public/win/WebInputEventFactory.h"
+#include "third_party/WebKit/WebKit/chromium/public/win/WebInputEventFactory.h"
using WebKit::WebInputEventFactory;
using WebKit::WebKeyboardEvent;
diff --git a/chrome/common/plugin_messages.h b/chrome/common/plugin_messages.h
index 6ce53b8..c4c70fb 100644
--- a/chrome/common/plugin_messages.h
+++ b/chrome/common/plugin_messages.h
@@ -21,8 +21,8 @@
#include "googleurl/src/gurl.h"
#include "ipc/ipc_message_utils.h"
#include "third_party/npapi/bindings/npapi.h"
-#include "webkit/api/public/WebBindings.h"
-#include "webkit/api/public/WebInputEvent.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
#include "webkit/glue/npruntime_util.h"
// Name prefix of the event handle when a message box is displayed.
diff --git a/chrome/common/webkit_param_traits.h b/chrome/common/webkit_param_traits.h
index dacaf08..5dfd90d 100644
--- a/chrome/common/webkit_param_traits.h
+++ b/chrome/common/webkit_param_traits.h
@@ -24,16 +24,16 @@
#define CHROME_COMMON_WEBKIT_PARAM_TRAITS_H_
#include "ipc/ipc_message_utils.h"
-#include "webkit/api/public/WebCache.h"
-#include "webkit/api/public/WebCompositionCommand.h"
-#include "webkit/api/public/WebConsoleMessage.h"
-#include "webkit/api/public/WebContextMenuData.h"
-#include "webkit/api/public/WebDragOperation.h"
-#include "webkit/api/public/WebFindOptions.h"
-#include "webkit/api/public/WebInputEvent.h"
-#include "webkit/api/public/WebMediaPlayerAction.h"
-#include "webkit/api/public/WebScreenInfo.h"
-#include "webkit/api/public/WebTextDirection.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebCache.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebCompositionCommand.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebContextMenuData.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebFindOptions.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerAction.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h"
namespace IPC {
diff --git a/chrome/common/webmessageportchannel_impl.cc b/chrome/common/webmessageportchannel_impl.cc
index f585355..17b4fb8 100644
--- a/chrome/common/webmessageportchannel_impl.cc
+++ b/chrome/common/webmessageportchannel_impl.cc
@@ -7,8 +7,8 @@
#include "chrome/common/child_process.h"
#include "chrome/common/child_thread.h"
#include "chrome/common/worker_messages.h"
-#include "webkit/api/public/WebString.h"
-#include "webkit/api/public/WebMessagePortChannelClient.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebMessagePortChannelClient.h"
using WebKit::WebMessagePortChannel;
using WebKit::WebMessagePortChannelArray;
diff --git a/chrome/common/webmessageportchannel_impl.h b/chrome/common/webmessageportchannel_impl.h
index 89a36b0..da52b9d 100644
--- a/chrome/common/webmessageportchannel_impl.h
+++ b/chrome/common/webmessageportchannel_impl.h
@@ -13,7 +13,7 @@
#include "base/string16.h"
#include "base/ref_counted.h"
#include "ipc/ipc_channel.h"
-#include "webkit/api/public/WebMessagePortChannel.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebMessagePortChannel.h"
// This is thread safe.
class WebMessagePortChannelImpl