diff options
84 files changed, 97 insertions, 108 deletions
diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc index 5455bef..167a84f 100644 --- a/chrome/browser/instant/instant_loader.cc +++ b/chrome/browser/instant/instant_loader.cc @@ -22,7 +22,6 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/render_messages.h" -#include "chrome/common/renderer_preferences.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" @@ -38,6 +37,7 @@ #include "content/common/notification_source.h" #include "content/common/notification_type.h" #include "content/common/page_transition_types.h" +#include "content/common/renderer_preferences.h" #include "net/http/http_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/codec/png_codec.h" diff --git a/chrome/browser/notifications/balloon_host.cc b/chrome/browser/notifications/balloon_host.cc index a4aa634..7b2adea 100644 --- a/chrome/browser/notifications/balloon_host.cc +++ b/chrome/browser/notifications/balloon_host.cc @@ -15,13 +15,13 @@ #include "chrome/common/bindings_policy.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" -#include "chrome/common/renderer_preferences.h" #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/site_instance.h" #include "content/common/notification_service.h" #include "content/common/notification_source.h" #include "content/common/notification_type.h" +#include "content/common/renderer_preferences.h" #include "webkit/glue/webpreferences.h" BalloonHost::BalloonHost(Balloon* balloon) diff --git a/chrome/browser/renderer_preferences_util.h b/chrome/browser/renderer_preferences_util.h index f1ba8c7..ccca11a 100644 --- a/chrome/browser/renderer_preferences_util.h +++ b/chrome/browser/renderer_preferences_util.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_RENDERER_PREFERENCES_UTIL_H_ #pragma once -#include "chrome/common/renderer_preferences.h" +#include "content/common/renderer_preferences.h" class Profile; diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc index a1e338c..a7b46eb 100644 --- a/chrome/browser/ui/gtk/gtk_util.cc +++ b/chrome/browser/ui/gtk/gtk_util.cc @@ -26,10 +26,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/gtk/cairo_cached_surface.h" #include "chrome/browser/ui/gtk/gtk_theme_provider.h" -#include "chrome/common/renderer_preferences.h" #include "content/browser/disposition_utils.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/renderer_preferences.h" #include "googleurl/src/gurl.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 6733292..a845f31 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -211,8 +211,6 @@ 'common/render_messages.h', 'common/render_messages_params.cc', 'common/render_messages_params.h', - 'common/renderer_preferences.cc', - 'common/renderer_preferences.h', 'common/security_style.h', 'common/service_messages.h', 'common/service_process_util.cc', diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index c5c4a98..7646398 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -114,9 +114,6 @@ 'renderer/render_process_impl.h', 'renderer/render_thread.cc', 'renderer/render_thread.h', - 'renderer/render_view_linux.cc', - 'renderer/render_view_observer.cc', - 'renderer/render_view_observer.h', 'renderer/renderer_glue.cc', 'renderer/renderer_histogram_snapshots.cc', 'renderer/renderer_histogram_snapshots.h', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 7f2d305..6de97be 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2290,8 +2290,6 @@ 'renderer/autofill/form_manager_browsertest.cc', 'renderer/autofill/password_autofill_manager_unittest.cc', 'renderer/page_click_tracker_browsertest.cc', - 'renderer/render_view_browsertest.cc', - 'renderer/render_view_browsertest_mac.mm', 'renderer/safe_browsing/malware_dom_details_browsertest.cc', 'renderer/safe_browsing/phishing_classifier_browsertest.cc', 'renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc', @@ -2319,6 +2317,8 @@ '../content/browser/webui/web_ui_handler_browsertest.cc', '../content/browser/webui/web_ui_handler_browsertest.h', '../content/common/file_path_watcher/file_path_watcher_browsertest.cc', + '../content/renderer/render_view_browsertest.cc', + '../content/renderer/render_view_browsertest_mac.mm', '../content/renderer/render_widget_browsertest.cc', '../content/renderer/render_widget_browsertest.h', ], diff --git a/chrome/common/render_messages_params.h b/chrome/common/render_messages_params.h index 596f5d6..2362d18 100644 --- a/chrome/common/render_messages_params.h +++ b/chrome/common/render_messages_params.h @@ -18,11 +18,11 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_extent.h" #include "chrome/common/extensions/url_pattern.h" -#include "chrome/common/renderer_preferences.h" #include "chrome/common/window_container_type.h" #include "content/common/navigation_gesture.h" #include "content/common/navigation_types.h" #include "content/common/page_transition_types.h" +#include "content/common/renderer_preferences.h" #include "content/common/serialized_script_value.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_param_traits.h" diff --git a/chrome/renderer/autofill/autofill_agent.cc b/chrome/renderer/autofill/autofill_agent.cc index e5798b8..0cb4830 100644 --- a/chrome/renderer/autofill/autofill_agent.cc +++ b/chrome/renderer/autofill/autofill_agent.cc @@ -8,7 +8,7 @@ #include "chrome/common/autofill_messages.h" #include "chrome/common/chrome_constants.h" #include "chrome/renderer/autofill/password_autofill_manager.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" #include "grit/generated_resources.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement.h" diff --git a/chrome/renderer/autofill/autofill_agent.h b/chrome/renderer/autofill/autofill_agent.h index 298a800..e41afcd 100644 --- a/chrome/renderer/autofill/autofill_agent.h +++ b/chrome/renderer/autofill/autofill_agent.h @@ -13,7 +13,7 @@ #include "base/task.h" #include "chrome/renderer/autofill/form_manager.h" #include "chrome/renderer/page_click_listener.h" -#include "chrome/renderer/render_view_observer.h" +#include "content/renderer/render_view_observer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutoFillClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" diff --git a/chrome/renderer/autofill/password_autofill_manager.cc b/chrome/renderer/autofill/password_autofill_manager.cc index 8fd6c86..235e856 100644 --- a/chrome/renderer/autofill/password_autofill_manager.cc +++ b/chrome/renderer/autofill/password_autofill_manager.cc @@ -7,7 +7,7 @@ #include "base/message_loop.h" #include "base/scoped_ptr.h" #include "chrome/common/autofill_messages.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h" diff --git a/chrome/renderer/autofill/password_autofill_manager.h b/chrome/renderer/autofill/password_autofill_manager.h index 15bad82..a1e9312 100644 --- a/chrome/renderer/autofill/password_autofill_manager.h +++ b/chrome/renderer/autofill/password_autofill_manager.h @@ -11,7 +11,7 @@ #include "base/task.h" #include "chrome/renderer/page_click_listener.h" -#include "chrome/renderer/render_view_observer.h" +#include "content/renderer/render_view_observer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" #include "webkit/glue/password_form_dom_manager.h" diff --git a/chrome/renderer/blocked_plugin.cc b/chrome/renderer/blocked_plugin.cc index fa2b31a..e3c21f8 100644 --- a/chrome/renderer/blocked_plugin.cc +++ b/chrome/renderer/blocked_plugin.cc @@ -9,7 +9,7 @@ #include "base/values.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/render_messages.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" #include "grit/generated_resources.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebData.h" diff --git a/chrome/renderer/blocked_plugin.h b/chrome/renderer/blocked_plugin.h index eecff79..deda427 100644 --- a/chrome/renderer/blocked_plugin.h +++ b/chrome/renderer/blocked_plugin.h @@ -6,7 +6,7 @@ #define CHROME_RENDERER_BLOCKED_PLUGIN_H_ #pragma once -#include "chrome/renderer/render_view_observer.h" +#include "content/renderer/render_view_observer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" #include "webkit/glue/cpp_bound_class.h" #include "webkit/plugins/npapi/webview_plugin.h" diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index bfb146e..a821735 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -14,7 +14,7 @@ #include "chrome/renderer/blocked_plugin.h" #include "chrome/renderer/localized_error.h" #include "chrome/renderer/render_thread.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/renderer_resources.h" diff --git a/chrome/renderer/devtools_agent.cc b/chrome/renderer/devtools_agent.cc index 5934946..6d29061 100644 --- a/chrome/renderer/devtools_agent.cc +++ b/chrome/renderer/devtools_agent.cc @@ -11,7 +11,7 @@ #include "chrome/common/devtools_messages.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/devtools_agent_filter.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" #include "grit/webkit_chromium_resources.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h" diff --git a/chrome/renderer/devtools_agent.h b/chrome/renderer/devtools_agent.h index 84507c7..8f268c5 100644 --- a/chrome/renderer/devtools_agent.h +++ b/chrome/renderer/devtools_agent.h @@ -10,7 +10,7 @@ #include <string> #include "base/basictypes.h" -#include "chrome/renderer/render_view_observer.h" +#include "content/renderer/render_view_observer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgentClient.h" namespace WebKit { diff --git a/chrome/renderer/devtools_agent_filter.cc b/chrome/renderer/devtools_agent_filter.cc index 5f7de8e..4300461 100644 --- a/chrome/renderer/devtools_agent_filter.cc +++ b/chrome/renderer/devtools_agent_filter.cc @@ -8,8 +8,8 @@ #include "chrome/common/devtools_messages.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/devtools_agent.h" -#include "chrome/renderer/render_view.h" #include "content/renderer/plugin_channel_host.h" +#include "content/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" diff --git a/chrome/renderer/devtools_client.cc b/chrome/renderer/devtools_client.cc index 307ed07..4352098 100644 --- a/chrome/renderer/devtools_client.cc +++ b/chrome/renderer/devtools_client.cc @@ -11,7 +11,7 @@ #include "chrome/common/devtools_messages.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/render_thread.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsFrontend.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" #include "ui/base/ui_base_switches.h" diff --git a/chrome/renderer/devtools_client.h b/chrome/renderer/devtools_client.h index a9eedb6..b15e15e 100644 --- a/chrome/renderer/devtools_client.h +++ b/chrome/renderer/devtools_client.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" -#include "chrome/renderer/render_view_observer.h" +#include "content/renderer/render_view_observer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsFrontendClient.h" class MessageLoop; diff --git a/chrome/renderer/extensions/bindings_utils.cc b/chrome/renderer/extensions/bindings_utils.cc index 82c313f..b4e8039 100644 --- a/chrome/renderer/extensions/bindings_utils.cc +++ b/chrome/renderer/extensions/bindings_utils.cc @@ -7,7 +7,7 @@ #include "base/lazy_instance.h" #include "base/string_split.h" #include "base/string_util.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" using WebKit::WebFrame; diff --git a/chrome/renderer/extensions/chrome_app_bindings.cc b/chrome/renderer/extensions/chrome_app_bindings.cc index b183d98..f6a169b 100644 --- a/chrome/renderer/extensions/chrome_app_bindings.cc +++ b/chrome/renderer/extensions/chrome_app_bindings.cc @@ -9,7 +9,7 @@ #include "chrome/common/extensions/extension_set.h" #include "chrome/renderer/extensions/bindings_utils.h" #include "chrome/renderer/render_thread.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "v8/include/v8.h" diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc index 49f2fea..62787b1 100644 --- a/chrome/renderer/extensions/event_bindings.cc +++ b/chrome/renderer/extensions/event_bindings.cc @@ -14,7 +14,7 @@ #include "chrome/renderer/extensions/extension_process_bindings.h" #include "chrome/renderer/extensions/js_only_v8_extensions.h" #include "chrome/renderer/render_thread.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" #include "googleurl/src/gurl.h" #include "grit/renderer_resources.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc index dc2484f..1a1d7e5 100644 --- a/chrome/renderer/extensions/extension_process_bindings.cc +++ b/chrome/renderer/extensions/extension_process_bindings.cc @@ -28,8 +28,8 @@ #include "chrome/renderer/extensions/renderer_extension_bindings.h" #include "chrome/renderer/user_script_slave.h" #include "chrome/renderer/render_thread.h" -#include "chrome/renderer/render_view.h" -#include "chrome/renderer/render_view_visitor.h" +#include "content/renderer/render_view.h" +#include "content/renderer/render_view_visitor.h" #include "grit/common_resources.h" #include "grit/renderer_resources.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/renderer/extensions/renderer_extension_bindings.cc b/chrome/renderer/extensions/renderer_extension_bindings.cc index 8b40f85..f8cfe14 100644 --- a/chrome/renderer/extensions/renderer_extension_bindings.cc +++ b/chrome/renderer/extensions/renderer_extension_bindings.cc @@ -16,7 +16,7 @@ #include "chrome/renderer/extensions/bindings_utils.h" #include "chrome/renderer/extensions/event_bindings.h" #include "chrome/renderer/render_thread.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" #include "grit/renderer_resources.h" using bindings_utils::GetStringResource; diff --git a/chrome/renderer/external_extension.cc b/chrome/renderer/external_extension.cc index a713495..86abf89 100644 --- a/chrome/renderer/external_extension.cc +++ b/chrome/renderer/external_extension.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/render_messages_params.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "v8/include/v8.h" diff --git a/chrome/renderer/external_popup_menu.cc b/chrome/renderer/external_popup_menu.cc index d3245d4..fd26bbd 100644 --- a/chrome/renderer/external_popup_menu.cc +++ b/chrome/renderer/external_popup_menu.cc @@ -6,7 +6,7 @@ #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebExternalPopupMenuClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" diff --git a/chrome/renderer/page_click_tracker.cc b/chrome/renderer/page_click_tracker.cc index 2ba1349..5213dbd 100644 --- a/chrome/renderer/page_click_tracker.cc +++ b/chrome/renderer/page_click_tracker.cc @@ -6,7 +6,7 @@ #include "chrome/common/render_messages.h" #include "chrome/renderer/page_click_listener.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMMouseEvent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" diff --git a/chrome/renderer/page_click_tracker.h b/chrome/renderer/page_click_tracker.h index c2ae9d9..ac2a80d 100644 --- a/chrome/renderer/page_click_tracker.h +++ b/chrome/renderer/page_click_tracker.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/observer_list.h" -#include "chrome/renderer/render_view_observer.h" +#include "content/renderer/render_view_observer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMEventListener.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc index 17e55d8..834da83 100644 --- a/chrome/renderer/print_web_view_helper.cc +++ b/chrome/renderer/print_web_view_helper.cc @@ -13,7 +13,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" #include "grit/generated_resources.h" #include "printing/units.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" diff --git a/chrome/renderer/print_web_view_helper.h b/chrome/renderer/print_web_view_helper.h index 24bc593..2f71c2e 100644 --- a/chrome/renderer/print_web_view_helper.h +++ b/chrome/renderer/print_web_view_helper.h @@ -9,7 +9,7 @@ #include "base/scoped_ptr.h" #include "base/shared_memory.h" #include "base/time.h" -#include "chrome/renderer/render_view_observer.h" +#include "content/renderer/render_view_observer.h" #include "printing/native_metafile.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebViewClient.h" diff --git a/chrome/renderer/render_process_impl.cc b/chrome/renderer/render_process_impl.cc index aa890fc..6da0ba1 100644 --- a/chrome/renderer/render_process_impl.cc +++ b/chrome/renderer/render_process_impl.cc @@ -27,7 +27,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/render_thread.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_message_utils.h" #include "media/base/media.h" diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index e321c84..2b6fefa 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -29,7 +29,6 @@ #include "chrome/common/extensions/extension_set.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" -#include "chrome/common/renderer_preferences.h" #include "chrome/common/url_constants.h" #include "chrome/renderer/automation/dom_automation_v8_extension.h" #include "chrome/renderer/devtools_agent_filter.h" @@ -43,8 +42,6 @@ #include "chrome/renderer/loadtimes_extension_bindings.h" #include "chrome/renderer/net/renderer_net_predictor.h" #include "chrome/renderer/render_process_impl.h" -#include "chrome/renderer/render_view.h" -#include "chrome/renderer/render_view_visitor.h" #include "chrome/renderer/renderer_histogram_snapshots.h" #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h" #include "chrome/renderer/search_extension.h" @@ -58,6 +55,7 @@ #include "content/common/dom_storage_messages.h" #include "content/common/gpu_messages.h" #include "content/common/plugin_messages.h" +#include "content/common/renderer_preferences.h" #include "content/common/resource_dispatcher.h" #include "content/common/resource_messages.h" #include "content/common/web_database_observer_impl.h" @@ -67,6 +65,8 @@ #include "content/renderer/gpu_video_service_host.h" #include "content/renderer/indexed_db_dispatcher.h" #include "content/renderer/plugin_channel_host.h" +#include "content/renderer/render_view.h" +#include "content/renderer/render_view_visitor.h" #include "content/renderer/renderer_webidbfactory_impl.h" #include "content/renderer/renderer_webkitclient_impl.h" #include "ipc/ipc_channel_handle.h" diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h deleted file mode 100644 index cc7f278..0000000 --- a/chrome/renderer/render_view.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_RENDERER_RENDER_VIEW_H_ -#define CHROME_RENDERER_RENDER_VIEW_H_ -#pragma once - -// TODO(jam): remove me -#include "content/renderer/render_view.h" - -#endif // CHROME_RENDERER_RENDER_VIEW_H_ diff --git a/chrome/renderer/safe_browsing/malware_dom_details.cc b/chrome/renderer/safe_browsing/malware_dom_details.cc index 2488766..79624dd 100644 --- a/chrome/renderer/safe_browsing/malware_dom_details.cc +++ b/chrome/renderer/safe_browsing/malware_dom_details.cc @@ -8,7 +8,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" diff --git a/chrome/renderer/safe_browsing/malware_dom_details.h b/chrome/renderer/safe_browsing/malware_dom_details.h index b53a117..b042cba 100644 --- a/chrome/renderer/safe_browsing/malware_dom_details.h +++ b/chrome/renderer/safe_browsing/malware_dom_details.h @@ -16,7 +16,7 @@ #include "base/callback.h" #include "base/scoped_ptr.h" #include "base/task.h" -#include "chrome/renderer/render_view_observer.h" +#include "content/renderer/render_view_observer.h" class GURL; class RenderView; diff --git a/chrome/renderer/safe_browsing/phishing_classifier.cc b/chrome/renderer/safe_browsing/phishing_classifier.cc index 668d231..94f9392 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier.cc +++ b/chrome/renderer/safe_browsing/phishing_classifier.cc @@ -12,13 +12,13 @@ #include "base/sha2.h" #include "base/string_util.h" #include "chrome/common/url_constants.h" -#include "chrome/renderer/render_view.h" #include "chrome/renderer/safe_browsing/feature_extractor_clock.h" #include "chrome/renderer/safe_browsing/features.h" #include "chrome/renderer/safe_browsing/phishing_dom_feature_extractor.h" #include "chrome/renderer/safe_browsing/phishing_term_feature_extractor.h" #include "chrome/renderer/safe_browsing/phishing_url_feature_extractor.h" #include "chrome/renderer/safe_browsing/scorer.h" +#include "content/renderer/render_view.h" #include "googleurl/src/gurl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc index 05997e0..e47e422 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc +++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc @@ -13,11 +13,11 @@ #include "chrome/common/render_messages.h" #include "chrome/common/safebrowsing_messages.h" #include "chrome/renderer/render_thread.h" -#include "chrome/renderer/render_view.h" #include "chrome/renderer/safe_browsing/feature_extractor_clock.h" #include "chrome/renderer/safe_browsing/phishing_classifier.h" #include "chrome/renderer/safe_browsing/scorer.h" #include "content/renderer/navigation_state.h" +#include "content/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate.h b/chrome/renderer/safe_browsing/phishing_classifier_delegate.h index 7d2c078..4dc6b2c 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_delegate.h +++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate.h @@ -10,7 +10,7 @@ #include "base/scoped_ptr.h" #include "base/string16.h" -#include "chrome/renderer/render_view_observer.h" +#include "content/renderer/render_view_observer.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_platform_file.h" diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc index fdcc370..241078e 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc @@ -10,11 +10,11 @@ #include "base/scoped_ptr.h" #include "base/utf_string_conversions.h" #include "chrome/common/safebrowsing_messages.h" -#include "chrome/renderer/render_view.h" #include "chrome/renderer/safe_browsing/features.h" #include "chrome/renderer/safe_browsing/phishing_classifier.h" #include "chrome/renderer/safe_browsing/render_view_fake_resources_test.h" #include "chrome/renderer/safe_browsing/scorer.h" +#include "content/renderer/render_view.h" #include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" diff --git a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.cc b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.cc index a5e0ad4..e7f6d32 100644 --- a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.cc +++ b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.cc @@ -11,9 +11,9 @@ #include "base/metrics/histogram.h" #include "base/string_util.h" #include "base/time.h" -#include "chrome/renderer/render_view.h" #include "chrome/renderer/safe_browsing/feature_extractor_clock.h" #include "chrome/renderer/safe_browsing/features.h" +#include "content/renderer/render_view.h" #include "net/base/registry_controlled_domain.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" diff --git a/chrome/renderer/safe_browsing/phishing_thumbnailer.cc b/chrome/renderer/safe_browsing/phishing_thumbnailer.cc index de8c70b..d02878e 100644 --- a/chrome/renderer/safe_browsing/phishing_thumbnailer.cc +++ b/chrome/renderer/safe_browsing/phishing_thumbnailer.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/time.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" #include "skia/ext/bitmap_platform_device.h" #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc b/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc index e689196..504431a 100644 --- a/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc +++ b/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc @@ -13,13 +13,13 @@ #include "chrome/common/render_messages_params.h" #include "chrome/renderer/mock_render_process.h" #include "chrome/renderer/render_thread.h" -#include "chrome/renderer/render_view.h" #include "chrome/renderer/renderer_main_platform_delegate.h" #include "content/common/dom_storage_common.h" #include "content/common/main_function_params.h" #include "content/common/resource_messages.h" #include "content/common/resource_response.h" #include "content/common/sandbox_init_wrapper.h" +#include "content/renderer/render_view.h" #include "googleurl/src/gurl.h" #include "net/base/upload_data.h" #include "net/http/http_response_headers.h" diff --git a/chrome/renderer/safe_browsing/render_view_fake_resources_test.h b/chrome/renderer/safe_browsing/render_view_fake_resources_test.h index 34e964b..6c96a01 100644 --- a/chrome/renderer/safe_browsing/render_view_fake_resources_test.h +++ b/chrome/renderer/safe_browsing/render_view_fake_resources_test.h @@ -47,7 +47,7 @@ #include "base/message_loop.h" #include "base/scoped_ptr.h" -#include "chrome/renderer/render_view_visitor.h" +#include "content/renderer/render_view_visitor.h" #include "ipc/ipc_channel.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/renderer/search_extension.cc b/chrome/renderer/search_extension.cc index 4c9e28f..bdb4c97 100644 --- a/chrome/renderer/search_extension.cc +++ b/chrome/renderer/search_extension.cc @@ -9,8 +9,8 @@ #include "base/command_line.h" #include "chrome/common/render_messages_params.h" -#include "chrome/renderer/render_view.h" #include "chrome/renderer/searchbox.h" +#include "content/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "v8/include/v8.h" diff --git a/chrome/renderer/searchbox.cc b/chrome/renderer/searchbox.cc index dd5bf08..1e51208 100644 --- a/chrome/renderer/searchbox.cc +++ b/chrome/renderer/searchbox.cc @@ -5,8 +5,8 @@ #include "chrome/renderer/searchbox.h" #include "chrome/common/render_messages.h" -#include "chrome/renderer/render_view.h" #include "chrome/renderer/searchbox_extension.h" +#include "content/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" using WebKit::WebView; diff --git a/chrome/renderer/searchbox.h b/chrome/renderer/searchbox.h index 5903682..959abcc 100644 --- a/chrome/renderer/searchbox.h +++ b/chrome/renderer/searchbox.h @@ -9,8 +9,8 @@ #include <vector> #include "base/string16.h" -#include "chrome/renderer/render_view_observer.h" #include "chrome/common/instant_types.h" +#include "content/renderer/render_view_observer.h" #include "ui/gfx/rect.h" class SearchBox : public RenderViewObserver { diff --git a/chrome/renderer/searchbox_extension.cc b/chrome/renderer/searchbox_extension.cc index d866c49..4fe2552 100644 --- a/chrome/renderer/searchbox_extension.cc +++ b/chrome/renderer/searchbox_extension.cc @@ -11,8 +11,8 @@ #include "base/string_split.h" #include "base/stringprintf.h" #include "chrome/common/render_messages_params.h" -#include "chrome/renderer/render_view.h" #include "chrome/renderer/searchbox.h" +#include "content/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" diff --git a/chrome/renderer/spellchecker/spellcheck_provider.h b/chrome/renderer/spellchecker/spellcheck_provider.h index 9496dda..f51b594 100644 --- a/chrome/renderer/spellchecker/spellcheck_provider.h +++ b/chrome/renderer/spellchecker/spellcheck_provider.h @@ -9,7 +9,7 @@ #include <vector> #include "base/id_map.h" -#include "chrome/renderer/render_view_observer.h" +#include "content/renderer/render_view_observer.h" class RenderView; class SpellCheck; diff --git a/chrome/renderer/translate_helper.h b/chrome/renderer/translate_helper.h index 7f42bc7..4636fa1 100644 --- a/chrome/renderer/translate_helper.h +++ b/chrome/renderer/translate_helper.h @@ -10,7 +10,7 @@ #include "base/task.h" #include "chrome/common/translate_errors.h" -#include "chrome/renderer/render_view_observer.h" +#include "content/renderer/render_view_observer.h" class RenderView; namespace WebKit { diff --git a/chrome/renderer/user_script_idle_scheduler.cc b/chrome/renderer/user_script_idle_scheduler.cc index b2989a4..38a81f6 100644 --- a/chrome/renderer/user_script_idle_scheduler.cc +++ b/chrome/renderer/user_script_idle_scheduler.cc @@ -5,7 +5,7 @@ #include "chrome/renderer/user_script_idle_scheduler.h" #include "base/message_loop.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" namespace { // The length of time to wait after the DOM is complete to try and run user diff --git a/chrome/test/render_view_test.cc b/chrome/test/render_view_test.cc index dfca7ee..af71771 100644 --- a/chrome/test/render_view_test.cc +++ b/chrome/test/render_view_test.cc @@ -8,7 +8,6 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" -#include "chrome/common/renderer_preferences.h" #include "chrome/renderer/autofill/autofill_agent.h" #include "chrome/renderer/autofill/password_autofill_manager.h" #include "chrome/renderer/extensions/event_bindings.h" @@ -19,6 +18,7 @@ #include "chrome/renderer/renderer_main_platform_delegate.h" #include "content/common/dom_storage_common.h" #include "content/common/native_web_keyboard_event.h" +#include "content/common/renderer_preferences.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" diff --git a/chrome/test/render_view_test.h b/chrome/test/render_view_test.h index 296f41f..2bc248c 100644 --- a/chrome/test/render_view_test.h +++ b/chrome/test/render_view_test.h @@ -12,12 +12,12 @@ #include "base/scoped_ptr.h" #include "chrome/renderer/mock_keyboard.h" #include "chrome/renderer/mock_render_thread.h" -#include "chrome/renderer/render_view.h" #include "chrome/renderer/renderer_main_platform_delegate.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/renderer/content_renderer_client.h" +#include "content/renderer/render_view.h" #include "content/renderer/renderer_webkitclient_impl.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" diff --git a/content/browser/renderer_host/render_view_host_delegate.cc b/content/browser/renderer_host/render_view_host_delegate.cc index f169205..2fe7459 100644 --- a/content/browser/renderer_host/render_view_host_delegate.cc +++ b/content/browser/renderer_host/render_view_host_delegate.cc @@ -7,7 +7,7 @@ #include "base/singleton.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" -#include "chrome/common/renderer_preferences.h" +#include "content/common/renderer_preferences.h" #include "googleurl/src/gurl.h" #include "ui/gfx/rect.h" #include "webkit/glue/webpreferences.h" diff --git a/content/browser/tab_contents/interstitial_page.h b/content/browser/tab_contents/interstitial_page.h index e139620..a77a4cf 100644 --- a/content/browser/tab_contents/interstitial_page.h +++ b/content/browser/tab_contents/interstitial_page.h @@ -11,10 +11,10 @@ #include "base/process_util.h" #include "base/scoped_ptr.h" -#include "chrome/common/renderer_preferences.h" #include "content/browser/renderer_host/render_view_host_delegate.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" +#include "content/common/renderer_preferences.h" #include "googleurl/src/gurl.h" #include "ui/gfx/size.h" diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h index 0484a07..c541425 100644 --- a/content/browser/tab_contents/tab_contents.h +++ b/content/browser/tab_contents/tab_contents.h @@ -22,7 +22,6 @@ #include "chrome/browser/tab_contents/tab_specific_content_settings.h" #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" #include "chrome/common/instant_types.h" -#include "chrome/common/renderer_preferences.h" #include "chrome/common/translate_errors.h" #include "chrome/common/web_apps.h" #include "content/browser/renderer_host/render_view_host_delegate.h" @@ -35,6 +34,7 @@ #include "content/browser/webui/web_ui_factory.h" #include "content/common/notification_registrar.h" #include "content/common/property_bag.h" +#include "content/common/renderer_preferences.h" #include "net/base/load_states.h" #include "net/base/network_change_notifier.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/common/renderer_preferences.cc b/content/common/renderer_preferences.cc index 4c29dd8..2ec7a22 100644 --- a/chrome/common/renderer_preferences.cc +++ b/content/common/renderer_preferences.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 "chrome/common/renderer_preferences.h" +#include "content/common/renderer_preferences.h" RendererPreferences::RendererPreferences() : can_accept_load_drops(true), diff --git a/chrome/common/renderer_preferences.h b/content/common/renderer_preferences.h index 0bb72ef..6beb090 100644 --- a/chrome/common/renderer_preferences.h +++ b/content/common/renderer_preferences.h @@ -9,8 +9,8 @@ // Adding new values to this class probably involves updating // common/render_messages.h, browser/browser.cc, etc. -#ifndef CHROME_COMMON_RENDERER_PREFERENCES_H_ -#define CHROME_COMMON_RENDERER_PREFERENCES_H_ +#ifndef CONTENT_COMMON_RENDERER_PREFERENCES_H_ +#define CONTENT_COMMON_RENDERER_PREFERENCES_H_ #pragma once #include "third_party/skia/include/core/SkColor.h" @@ -75,4 +75,4 @@ struct RendererPreferences { double caret_blink_interval; }; -#endif // CHROME_COMMON_RENDERER_PREFERENCES_H_ +#endif // CONTENT_COMMON_RENDERER_PREFERENCES_H_ diff --git a/content/content_common.gypi b/content/content_common.gypi index 65b0e93..45ea981 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -140,6 +140,8 @@ 'common/process_watcher_win.cc', 'common/property_bag.cc', 'common/property_bag.h', + 'common/renderer_preferences.cc', + 'common/renderer_preferences.h', 'common/resource_dispatcher.cc', 'common/resource_dispatcher.h', 'common/resource_messages.h', diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index 04d9805..0282bf3 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -76,6 +76,10 @@ 'renderer/plugin_channel_host.h', 'renderer/render_view.cc', 'renderer/render_view.h', + 'renderer/render_view_linux.cc', + 'renderer/render_view_observer.cc', + 'renderer/render_view_observer.h', + 'renderer/render_view_visitor.h', 'renderer/render_widget.cc', 'renderer/render_widget.h', 'renderer/render_widget_fullscreen.cc', diff --git a/content/renderer/device_orientation_dispatcher.h b/content/renderer/device_orientation_dispatcher.h index a50a94f..9421b41 100644 --- a/content/renderer/device_orientation_dispatcher.h +++ b/content/renderer/device_orientation_dispatcher.h @@ -8,7 +8,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientationClient.h" #include "base/scoped_ptr.h" -#include "chrome/renderer/render_view_observer.h" +#include "content/renderer/render_view_observer.h" namespace WebKit { class WebDeviceOrientation; } diff --git a/content/renderer/geolocation_dispatcher.h b/content/renderer/geolocation_dispatcher.h index 2189946..3f70853 100644 --- a/content/renderer/geolocation_dispatcher.h +++ b/content/renderer/geolocation_dispatcher.h @@ -7,7 +7,7 @@ #pragma once #include "base/scoped_ptr.h" -#include "chrome/renderer/render_view_observer.h" +#include "content/renderer/render_view_observer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationController.h" diff --git a/content/renderer/indexed_db_dispatcher.cc b/content/renderer/indexed_db_dispatcher.cc index d422015..7572bdf 100644 --- a/content/renderer/indexed_db_dispatcher.cc +++ b/content/renderer/indexed_db_dispatcher.cc @@ -5,8 +5,8 @@ #include "content/renderer/indexed_db_dispatcher.h" #include "chrome/renderer/render_thread.h" -#include "chrome/renderer/render_view.h" #include "content/common/indexed_db_messages.h" +#include "content/renderer/render_view.h" #include "content/renderer/renderer_webidbcursor_impl.h" #include "content/renderer/renderer_webidbdatabase_impl.h" #include "content/renderer/renderer_webidbindex_impl.h" diff --git a/content/renderer/load_progress_tracker.cc b/content/renderer/load_progress_tracker.cc index aa384f6..5cdeb85 100644 --- a/content/renderer/load_progress_tracker.cc +++ b/content/renderer/load_progress_tracker.cc @@ -6,7 +6,7 @@ #include "base/message_loop.h" #include "chrome/common/render_messages.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" namespace { diff --git a/content/renderer/media/audio_renderer_impl.cc b/content/renderer/media/audio_renderer_impl.cc index 411a1d6..f982cb1 100644 --- a/content/renderer/media/audio_renderer_impl.cc +++ b/content/renderer/media/audio_renderer_impl.cc @@ -8,8 +8,8 @@ #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" -#include "chrome/renderer/render_view.h" #include "chrome/renderer/render_thread.h" +#include "content/renderer/render_view.h" #include "media/base/filter_host.h" namespace { diff --git a/content/renderer/notification_provider.cc b/content/renderer/notification_provider.cc index 73633fc..816f4ca 100644 --- a/content/renderer/notification_provider.cc +++ b/content/renderer/notification_provider.cc @@ -10,7 +10,7 @@ #include "chrome/common/render_messages_params.h" #include "chrome/common/url_constants.h" #include "chrome/renderer/render_thread.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPermissionCallback.h" diff --git a/content/renderer/notification_provider.h b/content/renderer/notification_provider.h index 4d641a8..0feddb6 100644 --- a/content/renderer/notification_provider.h +++ b/content/renderer/notification_provider.h @@ -6,8 +6,8 @@ #define CONTENT_RENDERER_NOTIFICATION_PROVIDER_H_ #pragma once -#include "chrome/renderer/render_view_observer.h" #include "content/renderer/active_notification_tracker.h" +#include "content/renderer/render_view_observer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotification.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h" diff --git a/content/renderer/p2p/socket_dispatcher.h b/content/renderer/p2p/socket_dispatcher.h index 93b9da0..acc5ef5 100644 --- a/content/renderer/p2p/socket_dispatcher.h +++ b/content/renderer/p2p/socket_dispatcher.h @@ -22,9 +22,9 @@ #include <vector> #include "base/id_map.h" -#include "chrome/renderer/render_view_observer.h" #include "content/common/p2p_sockets.h" #include "content/renderer/p2p/socket_client.h" +#include "content/renderer/render_view_observer.h" namespace base { class MessageLoopProxy; diff --git a/content/renderer/pepper_plugin_delegate_impl.cc b/content/renderer/pepper_plugin_delegate_impl.cc index 777de0b..2a916a6 100644 --- a/content/renderer/pepper_plugin_delegate_impl.cc +++ b/content/renderer/pepper_plugin_delegate_impl.cc @@ -19,7 +19,6 @@ #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" #include "chrome/renderer/render_thread.h" -#include "chrome/renderer/render_view.h" #include "content/common/child_process_messages.h" #include "content/common/child_thread.h" #include "content/common/file_system/file_system_dispatcher.h" @@ -31,6 +30,7 @@ #include "content/renderer/ggl.h" #include "content/renderer/gpu_channel_host.h" #include "content/renderer/pepper_platform_context_3d_impl.h" +#include "content/renderer/render_view.h" #include "content/renderer/webgraphicscontext3d_command_buffer_impl.h" #include "content/renderer/webplugin_delegate_proxy.h" #include "ipc/ipc_channel_handle.h" diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc index 64303eb..612693b 100644 --- a/content/renderer/render_view.cc +++ b/content/renderer/render_view.cc @@ -36,7 +36,6 @@ #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" #include "chrome/common/render_view_commands.h" -#include "chrome/common/renderer_preferences.h" #include "chrome/common/thumbnail_score.h" #include "chrome/common/url_constants.h" #include "chrome/common/web_apps.h" @@ -62,8 +61,6 @@ #include "chrome/renderer/print_web_view_helper.h" #include "chrome/renderer/render_process.h" #include "chrome/renderer/render_thread.h" -#include "chrome/renderer/render_view_observer.h" -#include "chrome/renderer/render_view_visitor.h" #include "chrome/renderer/safe_browsing/malware_dom_details.h" #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h" #include "chrome/renderer/searchbox.h" @@ -82,6 +79,7 @@ #include "content/common/notification_service.h" #include "content/common/page_zoom.h" #include "content/common/pepper_messages.h" +#include "content/common/renderer_preferences.h" #include "content/renderer/audio_message_filter.h" #include "content/renderer/content_renderer_client.h" #include "content/renderer/device_orientation_dispatcher.h" @@ -96,6 +94,8 @@ #include "content/renderer/plugin_channel_host.h" #include "content/renderer/renderer_webapplicationcachehost_impl.h" #include "content/renderer/renderer_webstoragenamespace_impl.h" +#include "content/renderer/render_view_observer.h" +#include "content/renderer/render_view_visitor.h" #include "content/renderer/render_widget_fullscreen.h" #include "content/renderer/render_widget_fullscreen_pepper.h" #include "content/renderer/speech_input_dispatcher.h" diff --git a/content/renderer/render_view.h b/content/renderer/render_view.h index 21e4e23..5166095 100644 --- a/content/renderer/render_view.h +++ b/content/renderer/render_view.h @@ -24,13 +24,13 @@ #include "build/build_config.h" #include "chrome/common/content_settings.h" #include "chrome/common/edit_command.h" -#include "chrome/common/renderer_preferences.h" #include "chrome/common/view_types.h" #include "chrome/renderer/external_popup_menu.h" #include "chrome/renderer/page_load_histograms.h" #include "content/renderer/renderer_webcookiejar_impl.h" #include "content/common/navigation_gesture.h" #include "content/common/page_zoom.h" +#include "content/common/renderer_preferences.h" #include "content/renderer/pepper_plugin_delegate_impl.h" #include "content/renderer/render_widget.h" #include "ipc/ipc_platform_file.h" diff --git a/chrome/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index 0efb6de..0efb6de 100644 --- a/chrome/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc diff --git a/chrome/renderer/render_view_browsertest_mac.mm b/content/renderer/render_view_browsertest_mac.mm index 56fe589..56fe589 100644 --- a/chrome/renderer/render_view_browsertest_mac.mm +++ b/content/renderer/render_view_browsertest_mac.mm diff --git a/chrome/renderer/render_view_linux.cc b/content/renderer/render_view_linux.cc index fc9e955..b8540a9 100644 --- a/chrome/renderer/render_view_linux.cc +++ b/content/renderer/render_view_linux.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" -#include "chrome/common/renderer_preferences.h" +#include "content/common/renderer_preferences.h" #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontRendering.h" using WebKit::WebFontRendering; diff --git a/chrome/renderer/render_view_observer.cc b/content/renderer/render_view_observer.cc index 9c9a4a8..b13f4c2 100644 --- a/chrome/renderer/render_view_observer.cc +++ b/content/renderer/render_view_observer.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/renderer/render_view_observer.h" +#include "content/renderer/render_view_observer.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" RenderViewObserver::RenderViewObserver(RenderView* render_view) : render_view_(render_view), diff --git a/chrome/renderer/render_view_observer.h b/content/renderer/render_view_observer.h index a65ccb9..cfa1cb4 100644 --- a/chrome/renderer/render_view_observer.h +++ b/content/renderer/render_view_observer.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 CHROME_RENDERER_RENDER_VIEW_OBSERVER_H_ -#define CHROME_RENDERER_RENDER_VIEW_OBSERVER_H_ +#ifndef CONTENT_RENDERER_RENDER_VIEW_OBSERVER_H_ +#define CONTENT_RENDERER_RENDER_VIEW_OBSERVER_H_ #pragma once #include "base/basictypes.h" @@ -69,4 +69,4 @@ class RenderViewObserver : public IPC::Channel::Listener, DISALLOW_COPY_AND_ASSIGN(RenderViewObserver); }; -#endif // CHROME_RENDERER_RENDER_VIEW_OBSERVER_H_ +#endif // CONTENT_RENDERER_RENDER_VIEW_OBSERVER_H_ diff --git a/chrome/renderer/render_view_visitor.h b/content/renderer/render_view_visitor.h index d94ae3b..4773ae1 100644 --- a/chrome/renderer/render_view_visitor.h +++ b/content/renderer/render_view_visitor.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 CHROME_RENDERER_RENDER_VIEW_VISITOR_H_ -#define CHROME_RENDERER_RENDER_VIEW_VISITOR_H_ +#ifndef CONTENT_RENDERER_RENDER_VIEW_VISITOR_H_ +#define CONTENT_RENDERER_RENDER_VIEW_VISITOR_H_ #pragma once class RenderView; @@ -17,4 +17,4 @@ class RenderViewVisitor { virtual ~RenderViewVisitor() {} }; -#endif // CHROME_RENDERER_RENDER_VIEW_VISITOR_H_ +#endif // CONTENT_RENDERER_RENDER_VIEW_VISITOR_H_ diff --git a/content/renderer/renderer_webapplicationcachehost_impl.cc b/content/renderer/renderer_webapplicationcachehost_impl.cc index b7d628b..40aff42 100644 --- a/content/renderer/renderer_webapplicationcachehost_impl.cc +++ b/content/renderer/renderer_webapplicationcachehost_impl.cc @@ -7,7 +7,7 @@ #include "chrome/common/content_settings_types.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/render_thread.h" -#include "chrome/renderer/render_view.h" +#include "content/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" diff --git a/content/renderer/renderer_webkitclient_impl.cc b/content/renderer/renderer_webkitclient_impl.cc index ae37b0d..2e14521 100644 --- a/content/renderer/renderer_webkitclient_impl.cc +++ b/content/renderer/renderer_webkitclient_impl.cc @@ -13,7 +13,6 @@ #include "chrome/common/render_messages.h" #include "chrome/renderer/net/renderer_net_predictor.h" #include "chrome/renderer/render_thread.h" -#include "chrome/renderer/render_view.h" #include "chrome/renderer/visitedlink_slave.h" #include "content/common/database_util.h" #include "content/common/file_system/webfilesystem_impl.h" @@ -22,6 +21,7 @@ #include "content/common/webblobregistry_impl.h" #include "content/common/webmessageportchannel_impl.h" #include "content/plugin/npobject_util.h" +#include "content/renderer/render_view.h" #include "content/renderer/renderer_webaudiodevice_impl.h" #include "content/renderer/renderer_webidbfactory_impl.h" #include "content/renderer/renderer_webstoragenamespace_impl.h" diff --git a/content/renderer/renderer_webstoragearea_impl.cc b/content/renderer/renderer_webstoragearea_impl.cc index 07d225c..fc49eca 100644 --- a/content/renderer/renderer_webstoragearea_impl.cc +++ b/content/renderer/renderer_webstoragearea_impl.cc @@ -5,8 +5,8 @@ #include "content/renderer/renderer_webstoragearea_impl.h" #include "chrome/renderer/render_thread.h" -#include "chrome/renderer/render_view.h" #include "content/common/dom_storage_messages.h" +#include "content/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" diff --git a/content/renderer/speech_input_dispatcher.cc b/content/renderer/speech_input_dispatcher.cc index 8175e40..b7a95a8 100644 --- a/content/renderer/speech_input_dispatcher.cc +++ b/content/renderer/speech_input_dispatcher.cc @@ -5,8 +5,8 @@ #include "content/renderer/speech_input_dispatcher.h" #include "base/utf_string_conversions.h" -#include "chrome/renderer/render_view.h" #include "content/common/speech_input_messages.h" +#include "content/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" diff --git a/content/renderer/speech_input_dispatcher.h b/content/renderer/speech_input_dispatcher.h index 44513bb..b235886 100644 --- a/content/renderer/speech_input_dispatcher.h +++ b/content/renderer/speech_input_dispatcher.h @@ -6,8 +6,8 @@ #define CONTENT_RENDERER_SPEECH_INPUT_DISPATCHER_H_ #include "base/basictypes.h" -#include "chrome/renderer/render_view_observer.h" #include "content/common/speech_input_result.h" +#include "content/renderer/render_view_observer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechInputController.h" class GURL; diff --git a/content/renderer/webgraphicscontext3d_command_buffer_impl.cc b/content/renderer/webgraphicscontext3d_command_buffer_impl.cc index 8619e96..daf98a0 100644 --- a/content/renderer/webgraphicscontext3d_command_buffer_impl.cc +++ b/content/renderer/webgraphicscontext3d_command_buffer_impl.cc @@ -20,8 +20,8 @@ #include "base/metrics/histogram.h" #include "chrome/common/chrome_switches.h" #include "chrome/renderer/render_thread.h" -#include "chrome/renderer/render_view.h" #include "content/renderer/gpu_channel_host.h" +#include "content/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" WebGraphicsContext3DCommandBufferImpl::WebGraphicsContext3DCommandBufferImpl() diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc index d858ebc..e2795f4 100644 --- a/content/renderer/webplugin_delegate_proxy.cc +++ b/content/renderer/webplugin_delegate_proxy.cc @@ -23,7 +23,6 @@ #include "chrome/common/child_process_logging.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/render_thread.h" -#include "chrome/renderer/render_view.h" #include "content/common/plugin_messages.h" #include "content/plugin/npobject_proxy.h" #include "content/plugin/npobject_stub.h" @@ -31,6 +30,7 @@ #include "content/renderer/command_buffer_proxy.h" #include "content/renderer/content_renderer_client.h" #include "content/renderer/plugin_channel_host.h" +#include "content/renderer/render_view.h" #include "ipc/ipc_channel_handle.h" #include "net/base/mime_util.h" #include "skia/ext/platform_canvas.h" |