summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-14 20:39:20 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-14 20:39:20 +0000
commit8bc38d2964d1a6477bee5e6e880efe3f1e027d8e (patch)
tree8603771fdb345df0ccba0572a28c4458f9ebb298
parent8cc980c55238ee905bededbfa1397cc09efd5bb0 (diff)
downloadchromium_src-8bc38d2964d1a6477bee5e6e880efe3f1e027d8e.zip
chromium_src-8bc38d2964d1a6477bee5e6e880efe3f1e027d8e.tar.gz
chromium_src-8bc38d2964d1a6477bee5e6e880efe3f1e027d8e.tar.bz2
Move NativeWebKeyboardEvent files into their intended final destinations prior to refactoring/cleanup.
TBR=jam@chromium.org http://crbug.com/99757 TEST=none Review URL: http://codereview.chromium.org/8289005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105564 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/login/eula_view.cc2
-rw-r--r--chrome/browser/extensions/extension_host.cc2
-rw-r--r--chrome/browser/extensions/extension_host_mac.mm2
-rw-r--r--chrome/browser/external_tab_container_win.cc2
-rw-r--r--chrome/browser/ui/cocoa/browser_window_cocoa.mm2
-rw-r--r--chrome/browser/ui/cocoa/browser_window_utils.mm2
-rw-r--r--chrome/browser/ui/cocoa/html_dialog_window_controller.mm2
-rw-r--r--chrome/browser/ui/gtk/browser_window_gtk.cc2
-rw-r--r--chrome/browser/ui/gtk/find_bar_gtk.cc2
-rw-r--r--chrome/browser/ui/gtk/html_dialog_gtk.cc2
-rw-r--r--chrome/browser/ui/panels/panel_browser_window_cocoa.mm2
-rw-r--r--chrome/browser/ui/views/dropdown_bar_host.h2
-rw-r--r--chrome/browser/ui/views/handle_web_keyboard_event_gtk.cc2
-rw-r--r--chrome/browser/ui/views/html_dialog_view.cc2
-rw-r--r--chrome/browser/ui/views/keyboard_overlay_dialog_view.cc2
-rw-r--r--chrome/browser/ui/views/unhandled_keyboard_event_handler.h2
-rw-r--r--chrome/common/native_web_keyboard_event_aura.cc2
-rw-r--r--chrome/common/native_web_keyboard_event_views.h2
-rw-r--r--chrome/test/base/chrome_render_view_test.cc2
-rw-r--r--content/browser/renderer_host/gtk_im_context_wrapper.cc2
-rw-r--r--content/browser/renderer_host/gtk_key_bindings_handler.cc2
-rw-r--r--content/browser/renderer_host/gtk_key_bindings_handler_unittest.cc2
-rw-r--r--content/browser/renderer_host/native_web_keyboard_event_gtk.cc (renamed from content/common/native_web_keyboard_event_gtk.cc)2
-rw-r--r--content/browser/renderer_host/native_web_keyboard_event_mac.mm (renamed from content/common/native_web_keyboard_event_mac.mm)2
-rw-r--r--content/browser/renderer_host/native_web_keyboard_event_win.cc (renamed from content/common/native_web_keyboard_event_win.cc)2
-rw-r--r--content/browser/renderer_host/render_view_host.cc2
-rw-r--r--content/browser/renderer_host/render_widget_host.cc2
-rw-r--r--content/browser/renderer_host/render_widget_host.h2
-rw-r--r--content/browser/renderer_host/render_widget_host_view_aura.cc2
-rw-r--r--content/browser/renderer_host/render_widget_host_view_gtk.cc2
-rw-r--r--content/browser/renderer_host/render_widget_host_view_mac.mm2
-rw-r--r--content/browser/renderer_host/render_widget_host_view_win.cc2
-rw-r--r--content/content_browser.gypi4
-rw-r--r--content/content_common.gypi4
-rw-r--r--content/public/browser/native_web_keyboard_event.h (renamed from content/common/native_web_keyboard_event.h)6
-rw-r--r--content/renderer/render_view_browsertest.cc2
-rw-r--r--content/renderer/render_view_browsertest_mac.mm2
-rw-r--r--content/test/render_view_test.cc2
-rw-r--r--content/test/render_view_test.h2
39 files changed, 43 insertions, 43 deletions
diff --git a/chrome/browser/chromeos/login/eula_view.cc b/chrome/browser/chromeos/login/eula_view.cc
index d3b3f50..79b6f11 100644
--- a/chrome/browser/chromeos/login/eula_view.cc
+++ b/chrome/browser/chromeos/login/eula_view.cc
@@ -30,7 +30,7 @@
#include "chrome/common/url_constants.h"
#include "content/browser/site_instance.h"
#include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/native_web_keyboard_event.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "grit/locale_settings.h"
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
index 8acb5bf..83b67f3 100644
--- a/chrome/browser/extensions/extension_host.cc
+++ b/chrome/browser/extensions/extension_host.cc
@@ -45,9 +45,9 @@
#include "content/browser/tab_contents/tab_contents.h"
#include "content/browser/tab_contents/tab_contents_view.h"
#include "content/common/content_client.h"
-#include "content/common/native_web_keyboard_event.h"
#include "content/common/notification_service.h"
#include "content/common/view_messages.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "content/public/common/bindings_policy.h"
#include "grit/browser_resources.h"
#include "grit/chromium_strings.h"
diff --git a/chrome/browser/extensions/extension_host_mac.mm b/chrome/browser/extensions/extension_host_mac.mm
index d5f16f8..64c5d92 100644
--- a/chrome/browser/extensions/extension_host_mac.mm
+++ b/chrome/browser/extensions/extension_host_mac.mm
@@ -9,7 +9,7 @@
#import "chrome/browser/ui/cocoa/info_bubble_window.h"
#include "chrome/common/chrome_view_types.h"
#include "content/browser/renderer_host/render_widget_host_view_mac.h"
-#include "content/common/native_web_keyboard_event.h"
+#include "content/public/browser/native_web_keyboard_event.h"
ExtensionHostMac::~ExtensionHostMac() {
// If there is a popup open for this host's extension, close it.
diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc
index 3228556..2def7ea 100644
--- a/chrome/browser/external_tab_container_win.cc
+++ b/chrome/browser/external_tab_container_win.cc
@@ -43,10 +43,10 @@
#include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
#include "content/browser/tab_contents/navigation_details.h"
#include "content/browser/tab_contents/provisional_load_details.h"
-#include "content/common/native_web_keyboard_event.h"
#include "content/common/notification_service.h"
#include "content/common/page_zoom.h"
#include "content/common/view_messages.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "content/public/common/bindings_policy.h"
#include "content/public/common/page_transition_types.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
index a35da2f..f2072b8 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -42,9 +42,9 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/native_web_keyboard_event.h"
#include "content/common/notification_details.h"
#include "content/common/notification_service.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util_mac.h"
diff --git a/chrome/browser/ui/cocoa/browser_window_utils.mm b/chrome/browser/ui/cocoa/browser_window_utils.mm
index d0809b7..442463d 100644
--- a/chrome/browser/ui/cocoa/browser_window_utils.mm
+++ b/chrome/browser/ui/cocoa/browser_window_utils.mm
@@ -13,7 +13,7 @@
#import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
#import "chrome/browser/ui/cocoa/nsmenuitem_additions.h"
#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
-#include "content/common/native_web_keyboard_event.h"
+#include "content/public/browser/native_web_keyboard_event.h"
@interface MenuWalker : NSObject
+ (NSMenuItem*)itemForKeyEquivalent:(NSEvent*)key
diff --git a/chrome/browser/ui/cocoa/html_dialog_window_controller.mm b/chrome/browser/ui/cocoa/html_dialog_window_controller.mm
index a0064ab..3c2bdcc 100644
--- a/chrome/browser/ui/cocoa/html_dialog_window_controller.mm
+++ b/chrome/browser/ui/cocoa/html_dialog_window_controller.mm
@@ -14,7 +14,7 @@
#include "chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h"
#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/native_web_keyboard_event.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/gfx/size.h"
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 5c39484..ca0ff0a 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -84,8 +84,8 @@
#include "content/browser/renderer_host/render_widget_host_view.h"
#include "content/browser/tab_contents/tab_contents.h"
#include "content/browser/tab_contents/tab_contents_view.h"
-#include "content/common/native_web_keyboard_event.h"
#include "content/common/notification_service.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
diff --git a/chrome/browser/ui/gtk/find_bar_gtk.cc b/chrome/browser/ui/gtk/find_bar_gtk.cc
index 81e233d..ffc0364 100644
--- a/chrome/browser/ui/gtk/find_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/find_bar_gtk.cc
@@ -34,8 +34,8 @@
#include "chrome/common/chrome_notification_types.h"
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/native_web_keyboard_event.h"
#include "content/common/notification_service.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "grit/theme_resources_standard.h"
diff --git a/chrome/browser/ui/gtk/html_dialog_gtk.cc b/chrome/browser/ui/gtk/html_dialog_gtk.cc
index b3ee7c2..8277e3c 100644
--- a/chrome/browser/ui/gtk/html_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/html_dialog_gtk.cc
@@ -16,7 +16,7 @@
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/native_web_keyboard_event.h"
+#include "content/public/browser/native_web_keyboard_event.h"
namespace browser {
diff --git a/chrome/browser/ui/panels/panel_browser_window_cocoa.mm b/chrome/browser/ui/panels/panel_browser_window_cocoa.mm
index 7f3bad1..781d0f4 100644
--- a/chrome/browser/ui/panels/panel_browser_window_cocoa.mm
+++ b/chrome/browser/ui/panels/panel_browser_window_cocoa.mm
@@ -13,7 +13,7 @@
#include "chrome/browser/ui/panels/panel_manager.h"
#import "chrome/browser/ui/panels/panel_titlebar_view_cocoa.h"
#import "chrome/browser/ui/panels/panel_window_controller_cocoa.h"
-#include "content/common/native_web_keyboard_event.h"
+#include "content/public/browser/native_web_keyboard_event.h"
namespace {
diff --git a/chrome/browser/ui/views/dropdown_bar_host.h b/chrome/browser/ui/views/dropdown_bar_host.h
index 914f240d..8445549 100644
--- a/chrome/browser/ui/views/dropdown_bar_host.h
+++ b/chrome/browser/ui/views/dropdown_bar_host.h
@@ -7,7 +7,7 @@
#pragma once
#include "base/memory/scoped_ptr.h"
-#include "content/common/native_web_keyboard_event.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "ui/base/animation/animation_delegate.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/rect.h"
diff --git a/chrome/browser/ui/views/handle_web_keyboard_event_gtk.cc b/chrome/browser/ui/views/handle_web_keyboard_event_gtk.cc
index 063bcd4..3422abe 100644
--- a/chrome/browser/ui/views/handle_web_keyboard_event_gtk.cc
+++ b/chrome/browser/ui/views/handle_web_keyboard_event_gtk.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ui/views/handle_web_keyboard_event.h"
-#include "content/common/native_web_keyboard_event.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "views/widget/native_widget_gtk.h"
void HandleWebKeyboardEvent(views::Widget* widget,
diff --git a/chrome/browser/ui/views/html_dialog_view.cc b/chrome/browser/ui/views/html_dialog_view.cc
index 0aa640c..deffc3f 100644
--- a/chrome/browser/ui/views/html_dialog_view.cc
+++ b/chrome/browser/ui/views/html_dialog_view.cc
@@ -11,9 +11,9 @@
#include "chrome/browser/ui/views/window.h"
#include "content/browser/tab_contents/tab_contents.h"
#include "content/common/content_notification_types.h"
-#include "content/common/native_web_keyboard_event.h"
#include "content/common/notification_details.h"
#include "content/common/notification_source.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "ui/base/keycodes/keyboard_codes.h"
#include "views/events/event.h"
#include "views/widget/root_view.h"
diff --git a/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc b/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc
index 36e1e8c..929f952 100644
--- a/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc
+++ b/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc
@@ -13,7 +13,7 @@
#include "chrome/browser/ui/views/keyboard_overlay_delegate.h"
#include "chrome/browser/ui/views/window.h"
#include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/native_web_keyboard_event.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "grit/generated_resources.h"
#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/views/unhandled_keyboard_event_handler.h b/chrome/browser/ui/views/unhandled_keyboard_event_handler.h
index 0e7127b..f5653d7 100644
--- a/chrome/browser/ui/views/unhandled_keyboard_event_handler.h
+++ b/chrome/browser/ui/views/unhandled_keyboard_event_handler.h
@@ -6,8 +6,8 @@
#define CHROME_BROWSER_UI_VIEWS_UNHANDLED_KEYBOARD_EVENT_HANDLER_H_
#pragma once
+#include "content/public/browser/native_web_keyboard_event.h"
#include "views/view.h"
-#include "content/common/native_web_keyboard_event.h"
namespace views {
class FocusManager;
diff --git a/chrome/common/native_web_keyboard_event_aura.cc b/chrome/common/native_web_keyboard_event_aura.cc
index 05558f6..88405e00 100644
--- a/chrome/common/native_web_keyboard_event_aura.cc
+++ b/chrome/common/native_web_keyboard_event_aura.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/common/native_web_keyboard_event.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#if !defined(OS_WIN)
diff --git a/chrome/common/native_web_keyboard_event_views.h b/chrome/common/native_web_keyboard_event_views.h
index 2c33511..ed29066 100644
--- a/chrome/common/native_web_keyboard_event_views.h
+++ b/chrome/common/native_web_keyboard_event_views.h
@@ -6,7 +6,7 @@
#define CHROME_COMMON_NATIVE_WEB_KEYBOARD_EVENT_VIEWS_H_
#pragma once
-#include "content/common/native_web_keyboard_event.h"
+#include "content/public/browser/native_web_keyboard_event.h"
namespace views {
class KeyEvent;
diff --git a/chrome/test/base/chrome_render_view_test.cc b/chrome/test/base/chrome_render_view_test.cc
index 4c4e96a..98e5e68 100644
--- a/chrome/test/base/chrome_render_view_test.cc
+++ b/chrome/test/base/chrome_render_view_test.cc
@@ -16,9 +16,9 @@
#include "chrome/renderer/extensions/extension_process_bindings.h"
#include "chrome/renderer/extensions/renderer_extension_bindings.h"
#include "content/common/dom_storage_common.h"
-#include "content/common/native_web_keyboard_event.h"
#include "content/common/renderer_preferences.h"
#include "content/common/view_messages.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "content/renderer/render_view_impl.h"
#include "content/renderer/renderer_main_platform_delegate.h"
#include "content/test/mock_render_process.h"
diff --git a/content/browser/renderer_host/gtk_im_context_wrapper.cc b/content/browser/renderer_host/gtk_im_context_wrapper.cc
index c5c4e03..6d9123f 100644
--- a/content/browser/renderer_host/gtk_im_context_wrapper.cc
+++ b/content/browser/renderer_host/gtk_im_context_wrapper.cc
@@ -15,7 +15,7 @@
#include "base/utf_string_conversions.h"
#include "content/browser/renderer_host/render_widget_host.h"
#include "content/browser/renderer_host/render_widget_host_view_gtk.h"
-#include "content/common/native_web_keyboard_event.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h"
#include "ui/base/gtk/gtk_im_context_util.h"
#include "ui/gfx/gtk_util.h"
diff --git a/content/browser/renderer_host/gtk_key_bindings_handler.cc b/content/browser/renderer_host/gtk_key_bindings_handler.cc
index 890046e..351ad630 100644
--- a/content/browser/renderer_host/gtk_key_bindings_handler.cc
+++ b/content/browser/renderer_host/gtk_key_bindings_handler.cc
@@ -10,7 +10,7 @@
#include "base/logging.h"
#include "base/string_util.h"
-#include "content/common/native_web_keyboard_event.h"
+#include "content/public/browser/native_web_keyboard_event.h"
GtkKeyBindingsHandler::GtkKeyBindingsHandler(GtkWidget* parent_widget)
: handler_(CreateNewHandler()) {
diff --git a/content/browser/renderer_host/gtk_key_bindings_handler_unittest.cc b/content/browser/renderer_host/gtk_key_bindings_handler_unittest.cc
index 10c824f..5c77e5b 100644
--- a/content/browser/renderer_host/gtk_key_bindings_handler_unittest.cc
+++ b/content/browser/renderer_host/gtk_key_bindings_handler_unittest.cc
@@ -16,7 +16,7 @@
#include "base/string_util.h"
#include "content/common/content_paths.h"
#include "content/common/edit_command.h"
-#include "content/common/native_web_keyboard_event.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "testing/gtest/include/gtest/gtest.h"
class GtkKeyBindingsHandlerTest : public testing::Test {
diff --git a/content/common/native_web_keyboard_event_gtk.cc b/content/browser/renderer_host/native_web_keyboard_event_gtk.cc
index aebe7c4..2c8570f 100644
--- a/content/common/native_web_keyboard_event_gtk.cc
+++ b/content/browser/renderer_host/native_web_keyboard_event_gtk.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/common/native_web_keyboard_event.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include <gdk/gdk.h>
diff --git a/content/common/native_web_keyboard_event_mac.mm b/content/browser/renderer_host/native_web_keyboard_event_mac.mm
index 0961753..8db1353 100644
--- a/content/common/native_web_keyboard_event_mac.mm
+++ b/content/browser/renderer_host/native_web_keyboard_event_mac.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/common/native_web_keyboard_event.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#import <AppKit/AppKit.h>
diff --git a/content/common/native_web_keyboard_event_win.cc b/content/browser/renderer_host/native_web_keyboard_event_win.cc
index 1cb04e6..c913d26 100644
--- a/content/common/native_web_keyboard_event_win.cc
+++ b/content/browser/renderer_host/native_web_keyboard_event_win.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/common/native_web_keyboard_event.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/win/WebInputEventFactory.h"
diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc
index 62449b2..3456c2e 100644
--- a/content/browser/renderer_host/render_view_host.cc
+++ b/content/browser/renderer_host/render_view_host.cc
@@ -33,13 +33,13 @@
#include "content/common/content_notification_types.h"
#include "content/common/desktop_notification_messages.h"
#include "content/common/drag_messages.h"
-#include "content/common/native_web_keyboard_event.h"
#include "content/common/notification_details.h"
#include "content/common/notification_service.h"
#include "content/common/result_codes.h"
#include "content/common/speech_input_messages.h"
#include "content/common/swapped_out_messages.h"
#include "content/common/view_messages.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "content/public/common/bindings_policy.h"
#include "content/public/common/url_constants.h"
#include "net/base/net_util.h"
diff --git a/content/browser/renderer_host/render_widget_host.cc b/content/browser/renderer_host/render_widget_host.cc
index 88660c1..fd61d2a 100644
--- a/content/browser/renderer_host/render_widget_host.cc
+++ b/content/browser/renderer_host/render_widget_host.cc
@@ -21,10 +21,10 @@
#include "content/browser/renderer_host/render_widget_host_view.h"
#include "content/browser/user_metrics.h"
#include "content/common/gpu/gpu_messages.h"
-#include "content/common/native_web_keyboard_event.h"
#include "content/common/notification_service.h"
#include "content/common/result_codes.h"
#include "content/common/view_messages.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "content/public/common/content_switches.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h"
#include "ui/base/keycodes/keyboard_codes.h"
diff --git a/content/browser/renderer_host/render_widget_host.h b/content/browser/renderer_host/render_widget_host.h
index 0436a86..4e36c73 100644
--- a/content/browser/renderer_host/render_widget_host.h
+++ b/content/browser/renderer_host/render_widget_host.h
@@ -16,9 +16,9 @@
#include "base/string16.h"
#include "base/timer.h"
#include "content/common/content_export.h"
-#include "content/common/native_web_keyboard_event.h"
#include "content/common/page_zoom.h"
#include "content/common/property_bag.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "ipc/ipc_channel.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index c6aeaea..fd06e23 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -7,7 +7,7 @@
#include "base/logging.h"
#include "content/browser/renderer_host/backing_store_skia.h"
#include "content/browser/renderer_host/render_widget_host.h"
-#include "content/common/native_web_keyboard_event.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
#include "ui/aura/desktop.h"
#include "ui/aura/event.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_gtk.cc b/content/browser/renderer_host/render_widget_host_view_gtk.cc
index 11b3357..6c3b7c0 100644
--- a/content/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/content/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -31,7 +31,7 @@
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/renderer_host/render_view_host_delegate.h"
#include "content/browser/renderer_host/render_widget_host.h"
-#include "content/common/native_web_keyboard_event.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "content/public/common/content_switches.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 75edded..ce48eac 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -31,9 +31,9 @@
#import "content/browser/renderer_host/text_input_client_mac.h"
#include "content/common/edit_command.h"
#include "content/common/gpu/gpu_messages.h"
-#include "content/common/native_web_keyboard_event.h"
#include "content/common/plugin_messages.h"
#include "content/common/view_messages.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "skia/ext/platform_canvas.h"
#import "third_party/mozilla/ComplexTextInputPanel.h"
#include "third_party/skia/include/core/SkColor.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc
index 2a3e0cb..7c870b8 100644
--- a/content/browser/renderer_host/render_widget_host_view_win.cc
+++ b/content/browser/renderer_host/render_widget_host_view_win.cc
@@ -25,10 +25,10 @@
#include "content/browser/renderer_host/backing_store_win.h"
#include "content/browser/renderer_host/render_process_host.h"
#include "content/browser/renderer_host/render_widget_host.h"
-#include "content/common/native_web_keyboard_event.h"
#include "content/common/notification_service.h"
#include "content/common/plugin_messages.h"
#include "content/common/view_messages.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "content/public/common/content_switches.h"
#include "skia/ext/skia_utils_win.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h"
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 1ac31fd..ac45e3f 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -371,6 +371,9 @@
'browser/renderer_host/pepper_message_filter.h',
'browser/renderer_host/quota_dispatcher_host.cc',
'browser/renderer_host/quota_dispatcher_host.h',
+ 'browser/renderer_host/native_web_keyboard_event_gtk.cc',
+ 'browser/renderer_host/native_web_keyboard_event_mac.mm',
+ 'browser/renderer_host/native_web_keyboard_event_win.cc',
'browser/renderer_host/redirect_to_file_resource_handler.cc',
'browser/renderer_host/redirect_to_file_resource_handler.h',
'browser/renderer_host/render_message_filter.cc',
@@ -548,6 +551,7 @@
'browser/zygote_host_linux.cc',
'browser/zygote_host_linux.h',
'browser/zygote_main_linux.cc',
+ 'public/browser/native_web_keyboard_event.h',
],
'conditions': [
['p2p_apis==1', {
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 0889810..22ad357 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -158,10 +158,6 @@
'common/message_router.cc',
'common/message_router.h',
'common/mime_registry_messages.h',
- 'common/native_web_keyboard_event.h',
- 'common/native_web_keyboard_event_gtk.cc',
- 'common/native_web_keyboard_event_mac.mm',
- 'common/native_web_keyboard_event_win.cc',
'common/navigation_gesture.h',
'common/navigation_types.h',
'common/net/url_fetcher.cc',
diff --git a/content/common/native_web_keyboard_event.h b/content/public/browser/native_web_keyboard_event.h
index 631273e..6f5e5ac 100644
--- a/content/common/native_web_keyboard_event.h
+++ b/content/public/browser/native_web_keyboard_event.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_COMMON_NATIVE_WEB_KEYBOARD_EVENT_H_
-#define CONTENT_COMMON_NATIVE_WEB_KEYBOARD_EVENT_H_
+#ifndef CONTENT_PUBLIC_BROWSER_NATIVE_WEB_KEYBOARD_EVENT_H_
+#define CONTENT_PUBLIC_BROWSER_NATIVE_WEB_KEYBOARD_EVENT_H_
#pragma once
#include "base/basictypes.h"
@@ -76,4 +76,4 @@ struct CONTENT_EXPORT NativeWebKeyboardEvent :
#endif
};
-#endif // CONTENT_COMMON_NATIVE_WEB_KEYBOARD_EVENT_H_
+#endif // CONTENT_PUBLIC_BROWSER_NATIVE_WEB_KEYBOARD_EVENT_H_
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index defa228..312f177 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -7,8 +7,8 @@
#include "base/shared_memory.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
-#include "content/common/native_web_keyboard_event.h"
#include "content/common/view_messages.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "content/renderer/render_view_impl.h"
#include "content/test/render_view_test.h"
#include "net/base/net_errors.h"
diff --git a/content/renderer/render_view_browsertest_mac.mm b/content/renderer/render_view_browsertest_mac.mm
index 218680c..0343e55 100644
--- a/content/renderer/render_view_browsertest_mac.mm
+++ b/content/renderer/render_view_browsertest_mac.mm
@@ -4,7 +4,7 @@
#include "base/string_util.h"
#include "base/string16.h"
-#include "content/common/native_web_keyboard_event.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "content/renderer/render_view_impl.h"
#include "content/test/render_view_test.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/test/render_view_test.cc b/content/test/render_view_test.cc
index b575550..661974b 100644
--- a/content/test/render_view_test.cc
+++ b/content/test/render_view_test.cc
@@ -5,9 +5,9 @@
#include "content/test/render_view_test.h"
#include "content/common/dom_storage_common.h"
-#include "content/common/native_web_keyboard_event.h"
#include "content/common/renderer_preferences.h"
#include "content/common/view_messages.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "content/renderer/render_view_impl.h"
#include "content/renderer/renderer_main_platform_delegate.h"
#include "content/test/mock_render_process.h"
diff --git a/content/test/render_view_test.h b/content/test/render_view_test.h
index 6cf1a14..7f6ac85 100644
--- a/content/test/render_view_test.h
+++ b/content/test/render_view_test.h
@@ -12,8 +12,8 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "content/common/main_function_params.h"
-#include "content/common/native_web_keyboard_event.h"
#include "content/common/sandbox_init_wrapper.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "content/renderer/mock_content_renderer_client.h"
#include "content/renderer/renderer_webkitplatformsupport_impl.h"
#include "content/test/mock_keyboard.h"