diff options
211 files changed, 871 insertions, 814 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index a037ebf..0e241d7 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -52,9 +52,7 @@ include_rules = [ "+content/browser/renderer_host/dummy_resource_handler.h", "+content/browser/renderer_host/mock_render_process_host.h", "+content/browser/renderer_host/render_process_host_browsertest.h", - "+content/browser/renderer_host/render_view_host.h", "+content/browser/renderer_host/render_view_host_factory.h", - "+content/browser/renderer_host/render_widget_host.h", "+content/browser/renderer_host/render_widget_host_view_mac_delegate.h", "+content/browser/renderer_host/resource_dispatcher_host.h", "+content/browser/renderer_host/resource_dispatcher_host_request_info.h", diff --git a/chrome/browser/accessibility/accessibility_win_browsertest.cc b/chrome/browser/accessibility/accessibility_win_browsertest.cc index 24237a1..72cb5ad 100644 --- a/chrome/browser/accessibility/accessibility_win_browsertest.cc +++ b/chrome/browser/accessibility/accessibility_win_browsertest.cc @@ -14,9 +14,10 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/renderer_host/test_render_view_host.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "third_party/iaccessible2/ia2_api_all.h" @@ -195,10 +196,8 @@ void RecursiveFindNodeInAccessibilityTree( // of the selected tab. IAccessible* AccessibilityWinBrowserTest::GetRendererAccessible() { - // TODO(joi): Remove this dependency. - static_cast<RenderViewHostImpl*>( - browser()->GetSelectedWebContents()->GetRenderViewHost())-> - set_send_accessibility_updated_notifications(true); + TestRenderViewHost::EnableAccessibilityUpdatedNotifications( + browser()->GetSelectedWebContents()->GetRenderViewHost()); HWND hwnd_render_widget_host_view = browser()->GetSelectedWebContents()->GetRenderWidgetHostView()-> diff --git a/chrome/browser/aeropeek_manager.cc b/chrome/browser/aeropeek_manager.cc index e24f906..f7c1bf7 100644 --- a/chrome/browser/aeropeek_manager.cc +++ b/chrome/browser/aeropeek_manager.cc @@ -25,8 +25,8 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/installer/util/browser_distribution.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_contents_view.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc index a322cfe..6c80558 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.cc +++ b/chrome/browser/autocomplete/autocomplete_edit.cc @@ -42,8 +42,8 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/autocomplete_history_manager.cc b/chrome/browser/autocomplete_history_manager.cc index cbada33..b7202d1 100644 --- a/chrome/browser/autocomplete_history_manager.cc +++ b/chrome/browser/autocomplete_history_manager.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -15,7 +15,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/autofill_messages.h" #include "chrome/common/pref_names.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "webkit/forms/form_data.h" diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc index 3986abb..7f2e6e4 100644 --- a/chrome/browser/autofill/autofill_browsertest.cc +++ b/chrome/browser/autofill/autofill_browsertest.cc @@ -27,9 +27,9 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/renderer_host/mock_render_process_host.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/test/test_url_fetcher_factory.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/autofill/autofill_external_delegate.cc b/chrome/browser/autofill/autofill_external_delegate.cc index 0afa89f..da3c9ab 100644 --- a/chrome/browser/autofill/autofill_external_delegate.cc +++ b/chrome/browser/autofill/autofill_external_delegate.cc @@ -8,7 +8,7 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/autofill_messages.h" #include "chrome/common/chrome_constants.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/autofill/autofill_manager.cc b/chrome/browser/autofill/autofill_manager.cc index f921957..9ed1e9b 100644 --- a/chrome/browser/autofill/autofill_manager.cc +++ b/chrome/browser/autofill/autofill_manager.cc @@ -44,10 +44,10 @@ #include "chrome/common/guid.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 74aec35..502a8e7 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -77,9 +77,9 @@ #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_item.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "net/proxy/proxy_config_service_fixed.h" diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc index abec747..9e00632 100644 --- a/chrome/browser/automation/automation_provider_observers.cc +++ b/chrome/browser/automation/automation_provider_observers.cc @@ -73,11 +73,11 @@ #include "chrome/common/chrome_view_type.h" #include "chrome/common/content_settings_types.h" #include "chrome/common/extensions/extension.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/dom_operation_notification_details.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/process_type.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/automation/automation_provider_win.cc b/chrome/browser/automation/automation_provider_win.cc index 76a3dc50..d03aca7 100644 --- a/chrome/browser/automation/automation_provider_win.cc +++ b/chrome/browser/automation/automation_provider_win.cc @@ -23,8 +23,8 @@ #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" #include "chrome/common/automation_messages.h" #include "chrome/common/render_messages.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/navigation_controller.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/page_zoom.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/chrome/browser/automation/automation_tab_helper_browsertest.cc b/chrome/browser/automation/automation_tab_helper_browsertest.cc index e320c12..060e666 100644 --- a/chrome/browser/automation/automation_tab_helper_browsertest.cc +++ b/chrome/browser/automation/automation_tab_helper_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -18,12 +18,12 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "net/base/net_util.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc index 4cbfd1d2..9d77012 100644 --- a/chrome/browser/automation/automation_util.cc +++ b/chrome/browser/automation/automation_util.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" -#include "base/stringprintf.h" #include "base/string_number_conversions.h" +#include "base/stringprintf.h" #include "base/synchronization/waitable_event.h" #include "base/time.h" #include "base/values.h" @@ -28,9 +28,9 @@ #include "chrome/common/automation_id.h" #include "chrome/common/chrome_view_type.h" #include "chrome/common/extensions/extension.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "net/base/cookie_monster.h" #include "net/base/cookie_store.h" diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index ba0df97..83dcbda 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -120,7 +120,6 @@ #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_child_process_host_iterator.h" #include "content/public/browser/child_process_data.h" #include "content/public/browser/favicon_status.h" @@ -130,6 +129,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/plugin_service.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/common/child_process_host.h" diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc index 8ddd479..c5b3d70 100644 --- a/chrome/browser/automation/url_request_automation_job.cc +++ b/chrome/browser/automation/url_request_automation_job.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -10,10 +10,10 @@ #include "base/time.h" #include "chrome/browser/automation/automation_resource_message_filter.h" #include "chrome/common/automation_messages.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/render_view_host.h" #include "net/base/cookie_monster.h" #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" diff --git a/chrome/browser/bookmarks/bookmark_manager_extension_api.cc b/chrome/browser/bookmarks/bookmark_manager_extension_api.cc index 569e960..18ba96d 100644 --- a/chrome/browser/bookmarks/bookmark_manager_extension_api.cc +++ b/chrome/browser/bookmarks/bookmark_manager_extension_api.cc @@ -23,7 +23,7 @@ #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/common/chrome_view_type.h" #include "chrome/common/pref_names.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc index 9d68a7b..20b829a 100644 --- a/chrome/browser/browser_focus_uitest.cc +++ b/chrome/browser/browser_focus_uitest.cc @@ -22,10 +22,10 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/interstitial_page.h" #include "content/public/browser/interstitial_page_delegate.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc index 5eb5525..6865bc4 100644 --- a/chrome/browser/browser_keyevents_browsertest.cc +++ b/chrome/browser/browser_keyevents_browsertest.cc @@ -15,10 +15,10 @@ #include "chrome/common/chrome_paths.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/dom_operation_notification_details.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc index 76e5300..daffffb 100644 --- a/chrome/browser/browser_shutdown.cc +++ b/chrome/browser/browser_shutdown.cc @@ -34,9 +34,9 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/switch_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "ui/base/resource/resource_bundle.h" #if defined(OS_WIN) diff --git a/chrome/browser/chrome_browser_application_mac.mm b/chrome/browser/chrome_browser_application_mac.mm index e04c277..449777cb 100644 --- a/chrome/browser/chrome_browser_application_mac.mm +++ b/chrome/browser/chrome_browser_application_mac.mm @@ -7,16 +7,16 @@ #import "base/logging.h" #include "base/mac/crash_logging.h" #import "base/mac/scoped_nsexception_enabler.h" -#import "base/metrics/histogram.h" #import "base/memory/scoped_nsobject.h" +#import "base/metrics/histogram.h" #import "base/sys_string_conversions.h" #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #import "chrome/common/mac/objc_method_swizzle.h" #import "chrome/common/mac/objc_zombie.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_accessibility_state.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" // The implementation of NSExceptions break various assumptions in the diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 38f66d7..4803a4e 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -28,8 +28,8 @@ #include "chrome/browser/extensions/api/webrequest/webrequest_api.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_info_map.h" -#include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_message_handler.h" +#include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_web_ui.h" #include "chrome/browser/extensions/extension_webkit_preferences.h" @@ -73,10 +73,10 @@ #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" #include "content/browser/browser_url_handler.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_main_parts.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/resource_context.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/chromeos/accessibility/accessibility_util.cc b/chrome/browser/chromeos/accessibility/accessibility_util.cc index 2079e9f..4176b26 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_util.cc +++ b/chrome/browser/chromeos/accessibility/accessibility_util.cc @@ -9,17 +9,17 @@ #include "base/logging.h" #include "chrome/browser/accessibility/accessibility_extension_api.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/extensions/extension_tts_api_platform.h" #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/extension_service.h" +#include "chrome/browser/extensions/extension_tts_api_platform.h" #include "chrome/browser/extensions/file_reader.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/pref_names.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_accessibility_state.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "grit/browser_resources.h" diff --git a/chrome/browser/chromeos/boot_times_loader.h b/chrome/browser/chromeos/boot_times_loader.h index fed2ed5..0bf9407 100644 --- a/chrome/browser/chromeos/boot_times_loader.h +++ b/chrome/browser/chromeos/boot_times_loader.h @@ -14,9 +14,9 @@ #include "base/compiler_specific.h" #include "base/time.h" #include "chrome/browser/cancelable_request.h" -#include "content/browser/renderer_host/render_widget_host.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "content/public/browser/render_widget_host.h" namespace chromeos { diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc index a26b06e..b2e0f44 100644 --- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc +++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc @@ -36,10 +36,10 @@ #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/file_browser_handler.h" #include "chrome/common/pref_names.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/chromeos/imageburner/burn_manager.cc b/chrome/browser/chromeos/imageburner/burn_manager.cc index d786111..31264fa 100644 --- a/chrome/browser/chromeos/imageburner/burn_manager.cc +++ b/chrome/browser/chromeos/imageburner/burn_manager.cc @@ -15,6 +15,8 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_manager.h" +#include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_fetcher.h" #include "net/base/file_stream.h" diff --git a/chrome/browser/chromeos/login/html_page_screen.cc b/chrome/browser/chromeos/login/html_page_screen.cc index ef4f5ae..56eab21 100644 --- a/chrome/browser/chromeos/login/html_page_screen.cc +++ b/chrome/browser/chromeos/login/html_page_screen.cc @@ -11,7 +11,7 @@ #include "chrome/browser/chromeos/input_method/input_method_util.h" #include "chrome/browser/chromeos/login/screen_observer.h" #include "chrome/browser/profiles/profile_manager.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" #include "googleurl/src/gurl.h" #include "ui/views/events/event.h" diff --git a/chrome/browser/chromeos/login/registration_screen.cc b/chrome/browser/chromeos/login/registration_screen.cc index f0cb19c..7e4af2d 100644 --- a/chrome/browser/chromeos/login/registration_screen.cc +++ b/chrome/browser/chromeos/login/registration_screen.cc @@ -11,8 +11,8 @@ #include "chrome/browser/chromeos/input_method/input_method_util.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/child_process_security_policy.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/chromeos/login/screen_locker_tester.cc b/chrome/browser/chromeos/login/screen_locker_tester.cc index f531563..5e7a9fe 100644 --- a/chrome/browser/chromeos/login/screen_locker_tester.cc +++ b/chrome/browser/chromeos/login/screen_locker_tester.cc @@ -6,8 +6,8 @@ #include <string> -#include "base/stringprintf.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/chromeos/login/login_status_consumer.h" @@ -15,7 +15,7 @@ #include "chrome/browser/chromeos/login/screen_locker.h" #include "chrome/browser/chromeos/login/webui_screen_locker.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "ui/views/controls/button/button.h" diff --git a/chrome/browser/chromeos/notifications/balloon_view.cc b/chrome/browser/chromeos/notifications/balloon_view.cc index 337c61e..e449149 100644 --- a/chrome/browser/chromeos/notifications/balloon_view.cc +++ b/chrome/browser/chromeos/notifications/balloon_view.cc @@ -19,9 +19,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/views/notifications/balloon_view_host.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/panels/panel_browsertest.cc b/chrome/browser/chromeos/panels/panel_browsertest.cc index db0484a..aa9db61 100644 --- a/chrome/browser/chromeos/panels/panel_browsertest.cc +++ b/chrome/browser/chromeos/panels/panel_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -9,9 +9,9 @@ #include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_view_host.h" #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h" #if defined(TOOLKIT_USES_GTK) diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc index 4764788..a522c04 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings.cc +++ b/chrome/browser/content_settings/tab_specific_content_settings.cc @@ -23,11 +23,11 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/render_messages.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index 43a6062..bcbee3c 100644 --- a/chrome/browser/debugger/devtools_sanity_unittest.cc +++ b/chrome/browser/debugger/devtools_sanity_unittest.cc @@ -23,7 +23,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/child_process_data.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/devtools_agent_host_registry.h" @@ -31,6 +30,7 @@ #include "content/public/browser/devtools_manager.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/worker_service.h" diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc index d78ac55..0088eef 100644 --- a/chrome/browser/debugger/devtools_window.cc +++ b/chrome/browser/debugger/devtools_window.cc @@ -32,7 +32,6 @@ #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" #include "content/browser/load_notification_details.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/devtools_agent_host_registry.h" #include "content/public/browser/devtools_manager.h" @@ -41,6 +40,7 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/bindings_policy.h" diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index ad04c17..5874cce 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -47,11 +47,11 @@ #include "content/browser/download/download_persistent_store_info.h" #include "content/browser/net/url_request_mock_http_job.h" #include "content/browser/net/url_request_slow_download_job.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/notification_source.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/context_menu_params.h" #include "content/public/common/page_transition_types.h" diff --git a/chrome/browser/download/download_extension_api.cc b/chrome/browser/download/download_extension_api.cc index e1f811d..9027b27 100644 --- a/chrome/browser/download/download_extension_api.cc +++ b/chrome/browser/download/download_extension_api.cc @@ -40,10 +40,10 @@ #include "content/browser/download/download_state_info.h" #include "content/browser/download/download_types.h" #include "content/browser/download/interrupt_reasons.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/public/browser/download_item.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "net/base/load_flags.h" #include "net/http/http_util.h" #include "net/url_request/url_request.h" diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 14018c6..5604b8f 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -34,10 +34,10 @@ #include "chrome/common/time_format.h" #include "content/browser/download/download_create_info.h" #include "content/browser/download/download_types.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" +#include "content/public/browser/render_view_host.h" #include "content/public/common/url_constants.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/extensions/alert_apitest.cc b/chrome/browser/extensions/alert_apitest.cc index fe026b6..d9388bf 100644 --- a/chrome/browser/extensions/alert_apitest.cc +++ b/chrome/browser/extensions/alert_apitest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -11,7 +11,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" IN_PROC_BROWSER_TEST_F(ExtensionApiTest, AlertBasic) { ASSERT_TRUE(RunExtensionTest("alert")) << message_; diff --git a/chrome/browser/extensions/api/webrequest/webrequest_apitest.cc b/chrome/browser/extensions/api/webrequest/webrequest_apitest.cc index 349df3a7c..59247b5 100644 --- a/chrome/browser/extensions/api/webrequest/webrequest_apitest.cc +++ b/chrome/browser/extensions/api/webrequest/webrequest_apitest.cc @@ -12,9 +12,9 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "net/base/mock_host_resolver.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index 70411a6..6ad15cf 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -17,10 +17,10 @@ #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/string_ordinal.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/test/test_navigation_observer.h" #include "net/base/mock_host_resolver.h" diff --git a/chrome/browser/extensions/execute_code_in_tab_function.cc b/chrome/browser/extensions/execute_code_in_tab_function.cc index 15b8c31..5e98a8d 100644 --- a/chrome/browser/extensions/execute_code_in_tab_function.cc +++ b/chrome/browser/extensions/execute_code_in_tab_function.cc @@ -22,8 +22,7 @@ #include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/extension_message_bundle.h" #include "chrome/common/extensions/extension_messages.h" -#include "content/browser/renderer_host/render_view_host.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc index ad81f40..6219c82 100644 --- a/chrome/browser/extensions/extension_browsertests_misc.cc +++ b/chrome/browser/extensions/extension_browsertests_misc.cc @@ -24,9 +24,9 @@ #include "chrome/common/extensions/extension_action.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" #include "net/base/net_util.h" diff --git a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc index 300e04e..48b52df 100644 --- a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc +++ b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc @@ -17,9 +17,9 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/result_codes.h" diff --git a/chrome/browser/extensions/extension_debugger_api.cc b/chrome/browser/extensions/extension_debugger_api.cc index b78915f3..c040165 100644 --- a/chrome/browser/extensions/extension_debugger_api.cc +++ b/chrome/browser/extensions/extension_debugger_api.cc @@ -26,17 +26,17 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_error_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/devtools_agent_host_registry.h" #include "content/public/browser/devtools_client_host.h" #include "content/public/browser/devtools_manager.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" -#include "webkit/glue/webkit_glue.h" #include "ui/base/l10n/l10n_util.h" +#include "webkit/glue/webkit_glue.h" using content::DevToolsAgentHost; using content::DevToolsAgentHostRegistry; diff --git a/chrome/browser/extensions/extension_devtools_browsertests.cc b/chrome/browser/extensions/extension_devtools_browsertests.cc index 78e0a6b..ccba4d1 100644 --- a/chrome/browser/extensions/extension_devtools_browsertests.cc +++ b/chrome/browser/extensions/extension_devtools_browsertests.cc @@ -16,10 +16,10 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/devtools_agent_host_registry.h" #include "content/public/browser/devtools_client_host.h" #include "content/public/browser/devtools_manager.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "net/base/net_util.h" diff --git a/chrome/browser/extensions/extension_function.cc b/chrome/browser/extensions/extension_function.cc index da32f61..5c22043 100644 --- a/chrome/browser/extensions/extension_function.cc +++ b/chrome/browser/extensions/extension_function.cc @@ -11,10 +11,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/chrome_render_message_filter.h" #include "chrome/common/extensions/extension_messages.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/user_metrics.h" #include "content/public/common/result_codes.h" diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc index 36500b0..a26b2b6 100644 --- a/chrome/browser/extensions/extension_function_dispatcher.cc +++ b/chrome/browser/extensions/extension_function_dispatcher.cc @@ -55,9 +55,9 @@ #include "chrome/browser/extensions/extension_webnavigation_api.h" #include "chrome/browser/extensions/extension_webstore_private_api.h" #include "chrome/browser/extensions/extensions_quota_service.h" -#include "chrome/browser/extensions/system/system_api.h" #include "chrome/browser/extensions/process_map.h" #include "chrome/browser/extensions/settings/settings_api.h" +#include "chrome/browser/extensions/system/system_api.h" #include "chrome/browser/external_protocol/external_protocol_handler.h" #include "chrome/browser/history/history_extension_api.h" #include "chrome/browser/history/top_sites_extension_api.h" @@ -72,12 +72,12 @@ #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_macros.h" -#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" +#include "third_party/skia/include/core/SkBitmap.h" #if defined(TOOLKIT_VIEWS) #include "chrome/browser/extensions/extension_input_api.h" @@ -88,12 +88,12 @@ #endif #if defined(OS_CHROMEOS) +#include "chrome/browser/chromeos/extensions/file_browser_private_api.h" +#include "chrome/browser/chromeos/media/media_player_extension_api.h" #include "chrome/browser/extensions/api/terminal/terminal_private_api.h" #include "chrome/browser/extensions/extension_info_private_api_chromeos.h" #include "chrome/browser/extensions/extension_input_ime_api.h" #include "chrome/browser/extensions/extension_input_method_api.h" -#include "chrome/browser/chromeos/extensions/file_browser_private_api.h" -#include "chrome/browser/chromeos/media/media_player_extension_api.h" #endif using extensions::ExtensionAPI; diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index 43de10c..af00fad 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -31,11 +31,11 @@ #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" diff --git a/chrome/browser/extensions/extension_idle_api.cc b/chrome/browser/extensions/extension_idle_api.cc index 4b80099..b663ea5 100644 --- a/chrome/browser/extensions/extension_idle_api.cc +++ b/chrome/browser/extensions/extension_idle_api.cc @@ -5,8 +5,8 @@ #include "chrome/browser/extensions/extension_idle_api.h" #include <algorithm> -#include <string> #include <map> +#include <string> #include "base/bind.h" #include "base/callback.h" @@ -20,7 +20,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" namespace keys = extension_idle_api_constants; diff --git a/chrome/browser/extensions/extension_management_browsertest.cc b/chrome/browser/extensions/extension_management_browsertest.cc index 5ed7fd8..8ef75a6 100644 --- a/chrome/browser/extensions/extension_management_browsertest.cc +++ b/chrome/browser/extensions/extension_management_browsertest.cc @@ -20,8 +20,8 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/common/url_fetcher.h" class ExtensionManagementTest : public ExtensionBrowserTest { diff --git a/chrome/browser/extensions/extension_message_handler.cc b/chrome/browser/extensions/extension_message_handler.cc index 5024962..3b216b7 100644 --- a/chrome/browser/extensions/extension_message_handler.cc +++ b/chrome/browser/extensions/extension_message_handler.cc @@ -7,8 +7,8 @@ #include "chrome/browser/extensions/extension_message_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension_messages.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" ExtensionMessageHandler::ExtensionMessageHandler( diff --git a/chrome/browser/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc index 7e71c2e..5392e2c 100644 --- a/chrome/browser/extensions/extension_message_service.cc +++ b/chrome/browser/extensions/extension_message_service.cc @@ -16,10 +16,10 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/extensions/extension_page_capture_api.cc b/chrome/browser/extensions/extension_page_capture_api.cc index a1d3c20..0f51bb25 100644 --- a/chrome/browser/extensions/extension_page_capture_api.cc +++ b/chrome/browser/extensions/extension_page_capture_api.cc @@ -10,14 +10,16 @@ #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension_messages.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include <limits> + using content::BrowserThread; using content::ChildProcessSecurityPolicy; using content::WebContents; diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc index 145f53e..5ecd548 100644 --- a/chrome/browser/extensions/extension_process_manager.cc +++ b/chrome/browser/extensions/extension_process_manager.cc @@ -18,10 +18,10 @@ #include "chrome/common/chrome_view_type.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/extensions/extension_tab_helper.cc b/chrome/browser/extensions/extension_tab_helper.cc index 1b8d3cb..c43495b 100644 --- a/chrome/browser/extensions/extension_tab_helper.cc +++ b/chrome/browser/extensions/extension_tab_helper.cc @@ -16,11 +16,11 @@ #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/extension_resource.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/invalidate_type.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/extensions/extension_tab_id_map.cc b/chrome/browser/extensions/extension_tab_id_map.cc index b91eb46..52e256d 100644 --- a/chrome/browser/extensions/extension_tab_id_map.cc +++ b/chrome/browser/extensions/extension_tab_id_map.cc @@ -10,7 +10,6 @@ #include "chrome/browser/tab_contents/retargeting_details.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/notification_observer.h" @@ -18,6 +17,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc index 018de67..02575ef 100644 --- a/chrome/browser/extensions/extension_tabs_module.cc +++ b/chrome/browser/extensions/extension_tabs_module.cc @@ -49,11 +49,11 @@ #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" diff --git a/chrome/browser/extensions/extension_webnavigation_api.cc b/chrome/browser/extensions/extension_webnavigation_api.cc index e08e179..25956fd 100644 --- a/chrome/browser/extensions/extension_webnavigation_api.cc +++ b/chrome/browser/extensions/extension_webnavigation_api.cc @@ -19,11 +19,11 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_request_details.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" #include "net/base/net_errors.h" diff --git a/chrome/browser/extensions/extension_webnavigation_apitest.cc b/chrome/browser/extensions/extension_webnavigation_apitest.cc index 6ef3f48..259239b 100644 --- a/chrome/browser/extensions/extension_webnavigation_apitest.cc +++ b/chrome/browser/extensions/extension_webnavigation_apitest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/context_menu_params.h" #include "net/base/mock_host_resolver.h" diff --git a/chrome/browser/extensions/isolated_app_browsertest.cc b/chrome/browser/extensions/isolated_app_browsertest.cc index 26f7952..94e993b 100644 --- a/chrome/browser/extensions/isolated_app_browsertest.cc +++ b/chrome/browser/extensions/isolated_app_browsertest.cc @@ -13,8 +13,8 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "net/base/mock_host_resolver.h" diff --git a/chrome/browser/extensions/process_management_browsertest.cc b/chrome/browser/extensions/process_management_browsertest.cc index 54022c6..2fea3cf 100644 --- a/chrome/browser/extensions/process_management_browsertest.cc +++ b/chrome/browser/extensions/process_management_browsertest.cc @@ -15,8 +15,8 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "net/base/mock_host_resolver.h" diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc index 512f3f9..7c9e1d9 100644 --- a/chrome/browser/external_tab_container_win.cc +++ b/chrome/browser/external_tab_container_win.cc @@ -41,14 +41,14 @@ #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" #include "content/browser/load_notification_details.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/browser/tab_contents/provisional_load_details.h" +#include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" -#include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_intents_dispatcher.h" #include "content/public/common/bindings_policy.h" @@ -59,10 +59,10 @@ #include "content/public/common/ssl_status.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebReferrerPolicy.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/menu_model.h" #include "ui/base/view_prop.h" diff --git a/chrome/browser/favicon/favicon_tab_helper.cc b/chrome/browser/favicon/favicon_tab_helper.cc index 3cf260b..3bb104a 100644 --- a/chrome/browser/favicon/favicon_tab_helper.cc +++ b/chrome/browser/favicon/favicon_tab_helper.cc @@ -10,13 +10,13 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/icon_messages.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/favicon_status.h" #include "content/public/browser/invalidate_type.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc index 8ecf979..1b0b036 100644 --- a/chrome/browser/file_select_helper.cc +++ b/chrome/browser/file_select_helper.cc @@ -16,10 +16,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/common/file_chooser_params.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc index 1943ed5..aa28177 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -22,19 +22,20 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" #include "net/base/net_util.h" +#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index 3d8d924..49a2627 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -23,11 +23,11 @@ #include "chrome/common/content_settings_pattern.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/dom_operation_notification_details.h" #include "content/public/browser/navigation_controller.h" -#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_details.h" +#include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/test/mock_geolocation.h" #include "net/base/net_util.h" diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/instant/instant_browsertest.cc index 7b2c464..6ef2750 100644 --- a/chrome/browser/instant/instant_browsertest.cc +++ b/chrome/browser/instant/instant_browsertest.cc @@ -28,9 +28,9 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc index 34837fe..ae6ed5e 100644 --- a/chrome/browser/instant/instant_loader.cc +++ b/chrome/browser/instant/instant_loader.cc @@ -31,8 +31,6 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/render_messages.h" -#include "content/browser/renderer_host/render_view_host.h" -#include "content/browser/renderer_host/render_widget_host.h" #include "content/browser/tab_contents/provisional_load_details.h" #include "content/public/browser/favicon_status.h" #include "content/public/browser/navigation_controller.h" @@ -44,7 +42,10 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_view_host.h" +#include "content/public/browser/render_widget_host.h" #include "content/public/browser/render_widget_host_view.h" +#include "content/public/browser/session_storage_namespace.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_contents_view.h" diff --git a/chrome/browser/instant/instant_unload_handler.cc b/chrome/browser/instant/instant_unload_handler.cc index a6f8695..36f4958 100644 --- a/chrome/browser/instant/instant_unload_handler.cc +++ b/chrome/browser/instant/instant_unload_handler.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -7,10 +7,12 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" +#include <algorithm> + using content::WebContents; // TabContentsDelegate implementation. This owns the TabContents supplied to the diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc index fceb0a4..6aebeca 100644 --- a/chrome/browser/memory_details.cc +++ b/chrome/browser/memory_details.cc @@ -16,13 +16,13 @@ #include "chrome/common/chrome_view_type.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_child_process_host_iterator.h" -#include "content/public/browser/child_process_data.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/child_process_data.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" #include "content/public/common/bindings_policy.h" @@ -205,8 +205,8 @@ void MemoryDetails::CollectChildInfoOnUIThread() { if (!widget || !widget->IsRenderView()) continue; - const RenderViewHost* host = static_cast<const RenderViewHostImpl*>( - RenderWidgetHostImpl::From(const_cast<RenderWidgetHost*>(widget))); + const RenderViewHost* host = + RenderViewHost::From(const_cast<RenderWidgetHost*>(widget)); content::RenderViewHostDelegate* host_delegate = host->GetDelegate(); DCHECK(host_delegate); GURL url = host_delegate->GetURL(); diff --git a/chrome/browser/memory_purger.cc b/chrome/browser/memory_purger.cc index bf0fc11..2fd534b 100644 --- a/chrome/browser/memory_purger.cc +++ b/chrome/browser/memory_purger.cc @@ -15,8 +15,8 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/render_messages.h" -#include "content/browser/renderer_host/render_widget_host.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_widget_host.h" #include "content/public/browser/resource_context.h" #include "net/proxy/proxy_resolver.h" #include "net/proxy/proxy_service.h" diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc index 043f789..d8b67a1 100644 --- a/chrome/browser/net/chrome_network_delegate.cc +++ b/chrome/browser/net/chrome_network_delegate.cc @@ -16,9 +16,9 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/task_manager/task_manager.h" #include "chrome/common/pref_names.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/render_view_host.h" #include "net/base/host_port_pair.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" diff --git a/chrome/browser/notifications/balloon_host.cc b/chrome/browser/notifications/balloon_host.cc index 8a265e2..7934a44 100644 --- a/chrome/browser/notifications/balloon_host.cc +++ b/chrome/browser/notifications/balloon_host.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/notifications/balloon_host.h" #include "chrome/browser/notifications/balloon.h" +#include "chrome/browser/notifications/balloon_host.h" #include "chrome/browser/notifications/notification.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_preferences_util.h" @@ -11,15 +11,15 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" #include "chrome/common/chrome_notification_types.h" +#include "chrome/common/chrome_view_type.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" -#include "chrome/common/chrome_view_type.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "content/public/common/bindings_policy.h" diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index 3ec20f1..f22b2a0 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -28,9 +28,9 @@ #include "chrome/common/content_settings_pattern.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/show_desktop_notification_params.h" #include "grit/browser_resources.h" diff --git a/chrome/browser/notifications/notification_object_proxy.cc b/chrome/browser/notifications/notification_object_proxy.cc index e725a01..e8afece 100644 --- a/chrome/browser/notifications/notification_object_proxy.cc +++ b/chrome/browser/notifications/notification_object_proxy.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/notifications/notification_object_proxy.h" #include "base/stringprintf.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" NotificationObjectProxy::NotificationObjectProxy(int process_id, int route_id, int notification_id, bool worker) diff --git a/chrome/browser/oom_priority_manager.cc b/chrome/browser/oom_priority_manager.cc index f274b5f..423f894 100644 --- a/chrome/browser/oom_priority_manager.cc +++ b/chrome/browser/oom_priority_manager.cc @@ -23,11 +23,11 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_constants.h" -#include "content/browser/renderer_host/render_widget_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_widget_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/zygote_host_linux.h" diff --git a/chrome/browser/password_manager_delegate_impl.cc b/chrome/browser/password_manager_delegate_impl.cc index 96c1b40..594fdab 100644 --- a/chrome/browser/password_manager_delegate_impl.cc +++ b/chrome/browser/password_manager_delegate_impl.cc @@ -12,8 +12,8 @@ #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/autofill_messages.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/navigation_entry.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/ssl_status.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/plugin_infobar_delegates.cc b/chrome/browser/plugin_infobar_delegates.cc index 5940568..314325d 100644 --- a/chrome/browser/plugin_infobar_delegates.cc +++ b/chrome/browser/plugin_infobar_delegates.cc @@ -12,7 +12,7 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/plugin_installer.cc b/chrome/browser/plugin_installer.cc index 149a981..9af1e40 100644 --- a/chrome/browser/plugin_installer.cc +++ b/chrome/browser/plugin_installer.cc @@ -8,22 +8,22 @@ #include "base/bind_helpers.h" #include "base/file_util.h" #include "base/process.h" -#include "chrome/browser/download/download_service_factory.h" #include "chrome/browser/download/download_service.h" +#include "chrome/browser/download/download_service_factory.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/plugin_installer_observer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "content/browser/download/download_types.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" -#include "content/public/browser/download_id.h" -#include "content/public/browser/download_manager.h" #include "content/public/browser/browser_context.h" -#include "content/public/browser/web_contents.h" +#include "content/public/browser/download_id.h" #include "content/public/browser/download_item.h" +#include "content/public/browser/download_manager.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" +#include "content/public/browser/web_contents.h" using content::BrowserThread; using content::DownloadItem; diff --git a/chrome/browser/plugin_observer.cc b/chrome/browser/plugin_observer.cc index 1a93d4d..3660d2f 100644 --- a/chrome/browser/plugin_observer.cc +++ b/chrome/browser/plugin_observer.cc @@ -19,7 +19,7 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index 57a3f49..bc1d191 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -6,8 +6,8 @@ #include "base/command_line.h" #include "base/path_service.h" -#include "base/stringprintf.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/test/test_timeouts.h" #include "base/utf_string_conversions.h" #include "base/values.h" @@ -32,11 +32,11 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/devtools_agent_host_registry.h" #include "content/public/browser/devtools_client_host.h" #include "content/public/browser/devtools_manager.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc index 2c70c1a..c8bbffb 100644 --- a/chrome/browser/prerender/prerender_contents.cc +++ b/chrome/browser/prerender/prerender_contents.cc @@ -23,11 +23,11 @@ #include "chrome/common/icon_messages.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_request_details.h" #include "content/public/browser/browser_child_process_host.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_contents_view.h" diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc index 441c873..68d0741 100644 --- a/chrome/browser/prerender/prerender_manager.cc +++ b/chrome/browser/prerender/prerender_manager.cc @@ -36,7 +36,6 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/render_messages.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/devtools_agent_host_registry.h" #include "content/public/browser/navigation_controller.h" @@ -44,6 +43,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/session_storage_namespace.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" diff --git a/chrome/browser/prerender/prerender_manager_unittest.cc b/chrome/browser/prerender/prerender_manager_unittest.cc index d60aaa0..29e19ec 100644 --- a/chrome/browser/prerender/prerender_manager_unittest.cc +++ b/chrome/browser/prerender/prerender_manager_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/prerender/prerender_tracker.cc b/chrome/browser/prerender/prerender_tracker.cc index 8672762..1198a11 100644 --- a/chrome/browser/prerender/prerender_tracker.cc +++ b/chrome/browser/prerender/prerender_tracker.cc @@ -8,9 +8,9 @@ #include "base/logging.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prerender/prerender_manager.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/resource_context.h" #include "net/base/load_flags.h" diff --git a/chrome/browser/printing/background_printing_manager.cc b/chrome/browser/printing/background_printing_manager.cc index c497ff0..6f648a1 100644 --- a/chrome/browser/printing/background_printing_manager.cc +++ b/chrome/browser/printing/background_printing_manager.cc @@ -11,10 +11,10 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc index d737c86..65dda87 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc @@ -28,8 +28,8 @@ #include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/pref_names.h" #include "chrome/common/service_messages.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "grit/chromium_strings.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc index 529d642..b293094 100644 --- a/chrome/browser/printing/print_dialog_cloud.cc +++ b/chrome/browser/printing/print_dialog_cloud.cc @@ -27,13 +27,13 @@ #include "chrome/common/pref_names.h" #include "chrome/common/print_messages.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/printing/print_dialog_cloud_uitest.cc b/chrome/browser/printing/print_dialog_cloud_uitest.cc index 7d38201..1245464 100644 --- a/chrome/browser/printing/print_dialog_cloud_uitest.cc +++ b/chrome/browser/printing/print_dialog_cloud_uitest.cc @@ -23,9 +23,9 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/test/test_browser_thread.h" #include "net/url_request/url_request_filter.h" diff --git a/chrome/browser/printing/print_preview_message_handler.cc b/chrome/browser/printing/print_preview_message_handler.cc index e749ae3..d1cfb3c 100644 --- a/chrome/browser/printing/print_preview_message_handler.cc +++ b/chrome/browser/printing/print_preview_message_handler.cc @@ -18,8 +18,8 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h" #include "chrome/common/print_messages.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "printing/page_size_margins.h" diff --git a/chrome/browser/printing/print_preview_tab_controller.cc b/chrome/browser/printing/print_preview_tab_controller.cc index 464e64b..01c6f22 100644 --- a/chrome/browser/printing/print_preview_tab_controller.cc +++ b/chrome/browser/printing/print_preview_tab_controller.cc @@ -28,7 +28,6 @@ #include "chrome/common/chrome_content_client.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" @@ -36,6 +35,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" #include "webkit/plugins/webplugininfo.h" diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc index 3fcab11..10e7d1c 100644 --- a/chrome/browser/printing/print_view_manager.cc +++ b/chrome/browser/printing/print_view_manager.cc @@ -9,21 +9,22 @@ #include "base/bind.h" #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" +#include "base/timer.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/printing/print_job.h" #include "chrome/browser/printing/print_job_manager.h" #include "chrome/browser/printing/print_preview_tab_controller.h" -#include "chrome/browser/printing/printer_query.h" #include "chrome/browser/printing/print_view_manager_observer.h" +#include "chrome/browser/printing/printer_query.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/print_messages.h" -#include "content/browser/renderer_host/render_view_host.h" -#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_details.h" +#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" #include "printing/metafile.h" diff --git a/chrome/browser/renderer_host/chrome_render_view_host_observer.cc b/chrome/browser/renderer_host/chrome_render_view_host_observer.cc index 7aff13c..4d9444e 100644 --- a/chrome/browser/renderer_host/chrome_render_view_host_observer.cc +++ b/chrome/browser/renderer_host/chrome_render_view_host_observer.cc @@ -13,9 +13,10 @@ #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/site_instance.h" diff --git a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.h b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.h index f9b3497..f3607be 100644 --- a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.h +++ b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.h @@ -12,7 +12,6 @@ #import "content/public/browser/render_widget_host_view_mac_delegate.h" class RenderWidgetHost; -class RenderWidgetHostImpl; namespace ChromeRenderWidgetHostViewMacDelegateInternal { class SpellCheckRenderViewObserver; @@ -21,7 +20,7 @@ class SpellCheckRenderViewObserver; @interface ChromeRenderWidgetHostViewMacDelegate : NSObject<RenderWidgetHostViewMacDelegate> { @private - RenderWidgetHostImpl* renderWidgetHost_; // weak + RenderWidgetHost* renderWidgetHost_; // weak scoped_ptr<ChromeRenderWidgetHostViewMacDelegateInternal:: SpellCheckRenderViewObserver> spellingObserver_; diff --git a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm index 1214ff5..2a7bf97 100644 --- a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm +++ b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm @@ -16,9 +16,9 @@ #import "chrome/browser/ui/cocoa/view_id_util.h" #include "chrome/common/spellcheck_messages.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" -#include "content/browser/renderer_host/render_widget_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_observer.h" +#include "content/public/browser/render_widget_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" @@ -111,7 +111,7 @@ class SpellCheckRenderViewObserver : public content::RenderViewHostObserver { - (id)initWithRenderWidgetHost:(RenderWidgetHost*)renderWidgetHost { self = [super init]; if (self) { - renderWidgetHost_ = RenderWidgetHostImpl::From(renderWidgetHost); + renderWidgetHost_ = renderWidgetHost; NSView* nativeView = renderWidgetHost_->GetView()->GetNativeView(); view_id_util::SetID(nativeView, VIEW_ID_TAB_CONTAINER_FOCUS_VIEW); @@ -119,9 +119,7 @@ class SpellCheckRenderViewObserver : public content::RenderViewHostObserver { spellingObserver_.reset( new ChromeRenderWidgetHostViewMacDelegateInternal:: SpellCheckRenderViewObserver( - static_cast<RenderViewHost*>( - static_cast<RenderViewHostImpl*>(renderWidgetHost_)), - self)); + RenderViewHost::From(renderWidgetHost_), self)); } } return self; @@ -170,8 +168,7 @@ class SpellCheckRenderViewObserver : public content::RenderViewHostObserver { if (!renderWidgetHost_ || !renderWidgetHost_->IsRenderView()) return NO; if (DevToolsWindow::IsDevToolsWindow( - static_cast<RenderViewHost*>( - static_cast<RenderViewHostImpl*>(renderWidgetHost_)))) { + RenderViewHost::From(renderWidgetHost_))) { return NO; } diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc index 6987759..4be386f 100644 --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc @@ -29,11 +29,11 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/user_script.h" #include "chrome/common/render_messages.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/resource_context.h" #include "net/base/load_flags.h" #include "net/base/ssl_config_service.h" diff --git a/chrome/browser/renderer_host/offline_resource_throttle.cc b/chrome/browser/renderer_host/offline_resource_throttle.cc index 6d24a09..a7f370c 100644 --- a/chrome/browser/renderer_host/offline_resource_throttle.cc +++ b/chrome/browser/renderer_host/offline_resource_throttle.cc @@ -14,10 +14,10 @@ #include "chrome/browser/chromeos/offline/offline_load_page.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/resource_context.h" #include "content/public/browser/resource_throttle_controller.h" diff --git a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc index 4eb0d35..b3a7dbd 100644 --- a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc +++ b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc @@ -10,8 +10,8 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" namespace { @@ -28,12 +28,12 @@ RenderViewHost* FindFirstDevToolsHost() { render_process_host->ListenersIterator()); for (; !iter.IsAtEnd(); iter.Advance()) { const RenderWidgetHost* widget = - RenderWidgetHostImpl::FromIPCChannelListener(iter.GetCurrentValue()); + RenderWidgetHost::FromIPCChannelListener(iter.GetCurrentValue()); DCHECK(widget); if (!widget || !widget->IsRenderView()) continue; - RenderViewHost* host = static_cast<RenderViewHostImpl*>( - RenderWidgetHostImpl::From(const_cast<RenderWidgetHost*>(widget))); + RenderViewHost* host = + RenderViewHost::From(const_cast<RenderWidgetHost*>(widget)); content::RenderViewHostDelegate* host_delegate = host->GetDelegate(); GURL url = host_delegate->GetURL(); diff --git a/chrome/browser/renderer_host/transfer_navigation_resource_throttle.cc b/chrome/browser/renderer_host/transfer_navigation_resource_throttle.cc index 1fa047f..d676438 100644 --- a/chrome/browser/renderer_host/transfer_navigation_resource_throttle.cc +++ b/chrome/browser/renderer_host/transfer_navigation_resource_throttle.cc @@ -5,12 +5,12 @@ #include "chrome/browser/renderer_host/transfer_navigation_resource_throttle.h" #include "base/bind.h" -#include "chrome/browser/profiles/profile_io_data.h" #include "chrome/browser/extensions/extension_info_map.h" +#include "chrome/browser/profiles/profile_io_data.h" #include "chrome/common/extensions/extension_process_policy.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/common/referrer.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_host.cc b/chrome/browser/safe_browsing/client_side_detection_host.cc index bdc561e..d4b9696 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host.cc @@ -21,7 +21,6 @@ #include "chrome/common/pref_names.h" #include "chrome/common/safe_browsing/csd.pb.h" #include "chrome/common/safe_browsing/safebrowsing_messages.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_request_details.h" #include "content/public/browser/browser_thread.h" @@ -32,6 +31,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" #include "content/public/common/frame_navigate_params.h" diff --git a/chrome/browser/safe_browsing/malware_details.cc b/chrome/browser/safe_browsing/malware_details.cc index 3e0aa0b..877830e 100644 --- a/chrome/browser/safe_browsing/malware_details.cc +++ b/chrome/browser/safe_browsing/malware_details.cc @@ -15,10 +15,10 @@ #include "chrome/browser/safe_browsing/report.pb.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/common/safe_browsing/safebrowsing_messages.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "net/base/io_buffer.h" #include "net/disk_cache/disk_cache.h" diff --git a/chrome/browser/safe_browsing/malware_details_history.cc b/chrome/browser/safe_browsing/malware_details_history.cc index c83736e..3947f36 100644 --- a/chrome/browser/safe_browsing/malware_details_history.cc +++ b/chrome/browser/safe_browsing/malware_details_history.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. // @@ -11,10 +11,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/malware_details.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" using content::BrowserThread; diff --git a/chrome/browser/safe_browsing/safe_browsing_tab_observer.cc b/chrome/browser/safe_browsing/safe_browsing_tab_observer.cc index aa97188..a625a24 100644 --- a/chrome/browser/safe_browsing/safe_browsing_tab_observer.cc +++ b/chrome/browser/safe_browsing/safe_browsing_tab_observer.cc @@ -11,9 +11,9 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #if defined(ENABLE_SAFE_BROWSING) diff --git a/chrome/browser/search_engines/search_provider_install_state_message_filter.cc b/chrome/browser/search_engines/search_provider_install_state_message_filter.cc index 1b1701a..5ca60e4 100644 --- a/chrome/browser/search_engines/search_provider_install_state_message_filter.cc +++ b/chrome/browser/search_engines/search_provider_install_state_message_filter.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -8,10 +8,10 @@ #include "base/logging.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/render_messages.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "googleurl/src/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/sessions/restore_tab_helper.cc b/chrome/browser/sessions/restore_tab_helper.cc index f6d6253..3a3f21a 100644 --- a/chrome/browser/sessions/restore_tab_helper.cc +++ b/chrome/browser/sessions/restore_tab_helper.cc @@ -6,9 +6,9 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension_messages.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" using content::WebContents; diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc index 7d2d05b..8065582 100644 --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc @@ -30,12 +30,12 @@ #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/renderer_host/render_widget_host.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_widget_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc index d34b75b..5ad3b55 100644 --- a/chrome/browser/ssl/ssl_blocking_page.cc +++ b/chrome/browser/ssl/ssl_blocking_page.cc @@ -14,13 +14,13 @@ #include "chrome/browser/ssl/ssl_error_info.h" #include "chrome/common/jstemplate_builder.h" #include "content/browser/cert_store.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/interstitial_page.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/ssl_status.h" #include "grit/browser_resources.h" diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index 8c88a76..297225a 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -14,12 +14,12 @@ #include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/test_render_view_host.h" #include "content/public/browser/interstitial_page.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/security_style.h" #include "content/public/common/ssl_status.h" diff --git a/chrome/browser/tab_contents/background_contents.cc b/chrome/browser/tab_contents/background_contents.cc index 14e1cad..7d73127 100644 --- a/chrome/browser/tab_contents/background_contents.cc +++ b/chrome/browser/tab_contents/background_contents.cc @@ -10,11 +10,11 @@ #include "chrome/browser/renderer_preferences_util.h" #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" #include "chrome/common/chrome_notification_types.h" +#include "chrome/common/chrome_view_type.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/url_constants.h" -#include "chrome/common/chrome_view_type.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/tab_contents/chrome_web_contents_view_gtk_delegate.cc b/chrome/browser/tab_contents/chrome_web_contents_view_gtk_delegate.cc index 40c5b20..9585146 100644 --- a/chrome/browser/tab_contents/chrome_web_contents_view_gtk_delegate.cc +++ b/chrome/browser/tab_contents/chrome_web_contents_view_gtk_delegate.cc @@ -8,9 +8,9 @@ #include "chrome/browser/tab_contents/render_view_context_menu_gtk.h" #include "chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.h" #include "chrome/browser/ui/gtk/constrained_window_gtk.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents_view_gtk.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "ui/base/gtk/gtk_floating_container.h" diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index e068094..91b6908 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -61,12 +61,12 @@ #include "chrome/common/spellcheck_messages.h" #include "chrome/common/url_constants.h" #include "content/browser/download/download_types.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/speech_input_preferences.h" #include "content/public/browser/user_metrics.h" diff --git a/chrome/browser/tab_contents/spellchecker_submenu_observer_hunspell.cc b/chrome/browser/tab_contents/spellchecker_submenu_observer_hunspell.cc index a3c8a5c..5f8868a 100644 --- a/chrome/browser/tab_contents/spellchecker_submenu_observer_hunspell.cc +++ b/chrome/browser/tab_contents/spellchecker_submenu_observer_hunspell.cc @@ -14,7 +14,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/spellcheck_messages.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/tab_contents/spellchecker_submenu_observer_mac.cc b/chrome/browser/tab_contents/spellchecker_submenu_observer_mac.cc index b429b8b..67ed833 100644 --- a/chrome/browser/tab_contents/spellchecker_submenu_observer_mac.cc +++ b/chrome/browser/tab_contents/spellchecker_submenu_observer_mac.cc @@ -13,7 +13,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/spellcheck_messages.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/tab_contents/spelling_menu_observer.cc b/chrome/browser/tab_contents/spelling_menu_observer.cc index 2005bf6..39fa4b1 100644 --- a/chrome/browser/tab_contents/spelling_menu_observer.cc +++ b/chrome/browser/tab_contents/spelling_menu_observer.cc @@ -19,11 +19,12 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/spellcheck_result.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/common/context_menu_params.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/rect.h" using content::BrowserThread; diff --git a/chrome/browser/tab_contents/tab_util.cc b/chrome/browser/tab_contents/tab_util.cc index d3f9e2d..6d62095 100644 --- a/chrome/browser/tab_contents/tab_util.cc +++ b/chrome/browser/tab_contents/tab_util.cc @@ -8,7 +8,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" #include "chrome/common/chrome_switches.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/tab_contents/thumbnail_generator.cc b/chrome/browser/tab_contents/thumbnail_generator.cc index 5daa818..51e4f9d 100644 --- a/chrome/browser/tab_contents/thumbnail_generator.cc +++ b/chrome/browser/tab_contents/thumbnail_generator.cc @@ -16,11 +16,11 @@ #include "chrome/browser/history/top_sites.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/thumbnail_score.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "googleurl/src/gurl.h" #include "skia/ext/image_operations.h" diff --git a/chrome/browser/tab_render_watcher.cc b/chrome/browser/tab_render_watcher.cc index 4edb5ad..46ee3ee 100644 --- a/chrome/browser/tab_render_watcher.cc +++ b/chrome/browser/tab_render_watcher.cc @@ -4,11 +4,10 @@ #include "chrome/browser/tab_render_watcher.h" -#include "content/browser/renderer_host/render_widget_host.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" using content::WebContents; diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index f9e2d7f..b10cf75 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -29,11 +29,11 @@ #include "chrome/common/chrome_view_type.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/public/browser/browser_child_process_host.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" #include "content/public/common/result_codes.h" diff --git a/chrome/browser/task_manager/task_manager_notification_resource_provider.cc b/chrome/browser/task_manager/task_manager_notification_resource_provider.cc index 7e2180f..fb0de12 100644 --- a/chrome/browser/task_manager/task_manager_notification_resource_provider.cc +++ b/chrome/browser/task_manager/task_manager_notification_resource_provider.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -12,9 +12,9 @@ #include "chrome/browser/notifications/balloon_host.h" #include "chrome/browser/notifications/notification_ui_manager.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc index ae8ad23..6ac7513 100644 --- a/chrome/browser/task_manager/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager/task_manager_resource_providers.cc @@ -41,12 +41,12 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_child_process_host_iterator.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_data.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/process_type.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc index 1bf29d7..41a4c4a 100644 --- a/chrome/browser/translate/translate_manager.cc +++ b/chrome/browser/translate/translate_manager.cc @@ -34,7 +34,6 @@ #include "chrome/common/render_messages.h" #include "chrome/common/translate_errors.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" @@ -43,6 +42,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_fetcher.h" #include "grit/browser_resources.h" diff --git a/chrome/browser/ui/alternate_error_tab_observer.cc b/chrome/browser/ui/alternate_error_tab_observer.cc index bc18f9a..7b94bd8 100644 --- a/chrome/browser/ui/alternate_error_tab_observer.cc +++ b/chrome/browser/ui/alternate_error_tab_observer.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -9,8 +9,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" using content::WebContents; diff --git a/chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc b/chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc index b16321b..73285fa 100644 --- a/chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc +++ b/chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -10,10 +10,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/blocked_content/blocked_content_container.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" using content::NavigationEntry; diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 89138e9..ee16d7f 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -47,9 +47,9 @@ #include "chrome/browser/download/download_service_factory.h" #include "chrome/browser/download/download_started_animation.h" #include "chrome/browser/download/download_util.h" +#include "chrome/browser/extensions/browser_extension_window_controller.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/default_apps_trial.h" -#include "chrome/browser/extensions/browser_extension_window_controller.h" #include "chrome/browser/extensions/extension_browser_event_router.h" #include "chrome/browser/extensions/extension_disabled_infobar_delegate.h" #include "chrome/browser/extensions/extension_prefs.h" @@ -150,7 +150,6 @@ #include "chrome/common/url_constants.h" #include "chrome/common/web_apps.h" #include "content/browser/browser_url_handler.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/devtools_manager.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" @@ -161,6 +160,8 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/plugin_service.h" +#include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 830dd12..2a246c1 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -41,18 +41,18 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/favicon_status.h" #include "content/public/browser/interstitial_page.h" #include "content/public/browser/interstitial_page_delegate.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" -#include "content/public/common/renderer_preferences.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/common/page_transition_types.h" +#include "content/public/common/renderer_preferences.h" #include "content/public/common/url_constants.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc index e443fca..6dd05b2 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc @@ -32,8 +32,8 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/browser/browser_url_handler.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" #include "net/http/http_util.h" diff --git a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm index 8aef217..2702de1 100644 --- a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -18,9 +18,9 @@ #include "chrome/browser/ui/cocoa/applescript/error_applescript.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/save_page_type.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm index 239dd84..9edcb46 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm @@ -62,7 +62,7 @@ #include "chrome/browser/ui/window_sizer.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_view_mac.mm b/chrome/browser/ui/cocoa/extensions/extension_view_mac.mm index 0c02bee..6d55f33 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_view_mac.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_view_mac.mm @@ -7,8 +7,8 @@ #include "chrome/browser/ui/cocoa/extensions/extension_view_mac.h" #include "chrome/browser/extensions/extension_host.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/web_contents_view_mac.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm index b2b810f..e421475 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm @@ -18,7 +18,7 @@ #include "chrome/browser/ui/find_bar/find_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #import "content/browser/find_pasteboard.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller.mm b/chrome/browser/ui/cocoa/hung_renderer_controller.mm index ad42bfc..5a51d25 100644 --- a/chrome/browser/ui/cocoa/hung_renderer_controller.mm +++ b/chrome/browser/ui/cocoa/hung_renderer_controller.mm @@ -18,8 +18,8 @@ #include "chrome/browser/ui/tab_contents/core_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/logging_chrome.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/result_codes.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm index af197ea..91c3bcf 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -19,7 +19,7 @@ #import "chrome/browser/ui/cocoa/menu_controller.h" #import "chrome/browser/ui/cocoa/notifications/balloon_view.h" #include "chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.mm b/chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.mm index 1de4f77..b7748cc 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.mm @@ -6,7 +6,7 @@ #import <Cocoa/Cocoa.h> -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" diff --git a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm index 8c981ce..2b44bc2 100644 --- a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm +++ b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm @@ -7,7 +7,7 @@ #include <utility> #include "base/memory/scoped_nsobject.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm index fb51759..9cf821c 100644 --- a/chrome/browser/ui/cocoa/tabpose_window.mm +++ b/chrome/browser/ui/cocoa/tabpose_window.mm @@ -29,7 +29,7 @@ #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/pref_names.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/constrained_window_tab_helper.cc b/chrome/browser/ui/constrained_window_tab_helper.cc index fe72fec..27b50a5 100644 --- a/chrome/browser/ui/constrained_window_tab_helper.cc +++ b/chrome/browser/ui/constrained_window_tab_helper.cc @@ -8,9 +8,9 @@ #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/render_messages.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "net/base/registry_controlled_domain.h" diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc index 488f194..539145f 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc @@ -21,8 +21,8 @@ #include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc index 6788ae7..9dd9c9b 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc @@ -19,9 +19,9 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "net/test/test_server.h" diff --git a/chrome/browser/ui/find_bar/find_tab_helper.cc b/chrome/browser/ui/find_bar/find_tab_helper.cc index 2ca35f1..4847a194 100644 --- a/chrome/browser/ui/find_bar/find_tab_helper.cc +++ b/chrome/browser/ui/find_bar/find_tab_helper.cc @@ -9,9 +9,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/find_bar/find_bar_state.h" #include "chrome/browser/ui/find_bar/find_bar_state_factory.h" -#include "content/browser/renderer_host/render_view_host.h" #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/stop_find_action.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFindOptions.h" diff --git a/chrome/browser/ui/fullscreen_controller.cc b/chrome/browser/ui/fullscreen_controller.cc index e2072ad..4908a34 100644 --- a/chrome/browser/ui/fullscreen_controller.cc +++ b/chrome/browser/ui/fullscreen_controller.cc @@ -16,8 +16,8 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index 68296f8..7ab863e 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -77,10 +77,10 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" diff --git a/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc b/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc index cbf63a2..2583630 100644 --- a/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc +++ b/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc @@ -8,8 +8,8 @@ #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_source.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "ui/base/gtk/gtk_hig_constants.h" #include "ui/gfx/size.h" diff --git a/chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc index edb9ec6..f1c1f6d 100644 --- a/chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc @@ -21,9 +21,9 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/gtk/theme_service_gtk.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/ui/gtk/extensions/extension_view_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_view_gtk.cc index c2d8717..1b82a09 100644 --- a/chrome/browser/ui/gtk/extensions/extension_view_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/extension_view_gtk.cc @@ -6,7 +6,7 @@ #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/ui/gtk/extensions/extension_popup_gtk.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" diff --git a/chrome/browser/ui/gtk/find_bar_gtk.cc b/chrome/browser/ui/gtk/find_bar_gtk.cc index d3a290e..a9f4a96 100644 --- a/chrome/browser/ui/gtk/find_bar_gtk.cc +++ b/chrome/browser/ui/gtk/find_bar_gtk.cc @@ -33,9 +33,9 @@ #include "chrome/browser/ui/gtk/view_id_util.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/notification_source.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc index eac2dcc..dd31ffb5 100644 --- a/chrome/browser/ui/gtk/gtk_util.cc +++ b/chrome/browser/ui/gtk/gtk_util.cc @@ -27,7 +27,7 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/gtk/theme_service_gtk.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/renderer_preferences.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc index 4455e88..849563c 100644 --- a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc @@ -14,8 +14,8 @@ #include "chrome/browser/ui/tab_contents/core_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/logging_chrome.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/result_codes.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc b/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc index c804579..4ff1551 100644 --- a/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc +++ b/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc @@ -16,7 +16,7 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/extension_resource.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "grit/theme_resources.h" #include "ui/base/gtk/gtk_signal_registrar.h" diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc index d86fae8..1d84cb3 100644 --- a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc +++ b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc @@ -31,8 +31,8 @@ #include "chrome/browser/ui/gtk/theme_service_gtk.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_source.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.cc b/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.cc index c170904..74eaa46 100644 --- a/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.cc +++ b/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.cc @@ -7,7 +7,7 @@ #include <gtk/gtk.h> #include "chrome/browser/notifications/balloon.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/gtk/tabs/dragged_view_gtk.cc b/chrome/browser/ui/gtk/tabs/dragged_view_gtk.cc index 05d623a..b4c0ec0 100644 --- a/chrome/browser/ui/gtk/tabs/dragged_view_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/dragged_view_gtk.cc @@ -21,7 +21,7 @@ #include "chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h" #include "chrome/browser/ui/gtk/theme_service_gtk.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "third_party/skia/include/core/SkShader.h" #include "ui/base/gtk/gtk_screen_utils.h" diff --git a/chrome/browser/ui/gtk/web_intent_picker_gtk.cc b/chrome/browser/ui/gtk/web_intent_picker_gtk.cc index d542cc1..8f43936 100644 --- a/chrome/browser/ui/gtk/web_intent_picker_gtk.cc +++ b/chrome/browser/ui/gtk/web_intent_picker_gtk.cc @@ -25,10 +25,10 @@ #include "chrome/browser/ui/intents/web_intent_picker_delegate.h" #include "chrome/browser/ui/intents/web_intent_picker_model.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/ui/login/login_prompt.cc b/chrome/browser/ui/login/login_prompt.cc index acc9d31..bf700b8 100644 --- a/chrome/browser/ui/login/login_prompt.cc +++ b/chrome/browser/ui/login/login_prompt.cc @@ -15,12 +15,12 @@ #include "chrome/browser/ui/constrained_window.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/login/login_prompt_win.cc b/chrome/browser/ui/login/login_prompt_win.cc index 35fd978..8f0c451 100644 --- a/chrome/browser/ui/login/login_prompt_win.cc +++ b/chrome/browser/ui/login/login_prompt_win.cc @@ -11,9 +11,9 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/views/constrained_window_views.h" #include "chrome/browser/ui/views/login_view.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" #include "net/url_request/url_request.h" diff --git a/chrome/browser/ui/panels/panel.cc b/chrome/browser/ui/panels/panel.cc index a2e60a3..ac3027f 100644 --- a/chrome/browser/ui/panels/panel.cc +++ b/chrome/browser/ui/panels/panel.cc @@ -18,10 +18,10 @@ #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/ui/pdf/pdf_browsertest.cc b/chrome/browser/ui/pdf/pdf_browsertest.cc index 005844b..b06b385 100644 --- a/chrome/browser/ui/pdf/pdf_browsertest.cc +++ b/chrome/browser/ui/pdf/pdf_browsertest.cc @@ -15,9 +15,9 @@ #include "chrome/common/chrome_paths.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/notification_observer.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "net/test/test_server.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc index 7802982..340dba0 100644 --- a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc +++ b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc @@ -20,11 +20,11 @@ #include "chrome/common/chrome_content_client.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/pref_names.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/interstitial_page.h" #include "content/public/browser/interstitial_page_delegate.h" #include "content/public/browser/plugin_service.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "grit/browser_resources.h" diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc index e4e79f8..d522b73 100644 --- a/chrome/browser/ui/prefs/prefs_tab_helper.cc +++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc @@ -17,9 +17,9 @@ #include "chrome/browser/ui/constrained_window_tab_helper.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/tab_contents/core_tab_helper.cc b/chrome/browser/ui/tab_contents/core_tab_helper.cc index c6a563b..5618f3d 100644 --- a/chrome/browser/ui/tab_contents/core_tab_helper.cc +++ b/chrome/browser/ui/tab_contents/core_tab_helper.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -6,9 +6,10 @@ #include "chrome/browser/renderer_host/web_cache_manager.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "net/base/load_states.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index 2aabbdd..7c2c7b4 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -36,10 +36,10 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/page_navigator.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc index 9d65096..b19c34c 100644 --- a/chrome/browser/ui/views/browser_actions_container.cc +++ b/chrome/browser/ui/views/browser_actions_container.cc @@ -27,8 +27,8 @@ #include "chrome/common/extensions/extension_action.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/pref_names.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_source.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/views/dropdown_bar_host_win.cc b/chrome/browser/ui/views/dropdown_bar_host_win.cc index 1745689..0f443b4 100644 --- a/chrome/browser/ui/views/dropdown_bar_host_win.cc +++ b/chrome/browser/ui/views/dropdown_bar_host_win.cc @@ -6,7 +6,7 @@ #include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "chrome/browser/ui/views/frame/browser_view.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "ui/base/keycodes/keyboard_code_conversion_win.h" diff --git a/chrome/browser/ui/views/extensions/extension_dialog.cc b/chrome/browser/ui/views/extensions/extension_dialog.cc index 9f0ec8f..63171cd 100644 --- a/chrome/browser/ui/views/extensions/extension_dialog.cc +++ b/chrome/browser/ui/views/extensions/extension_dialog.cc @@ -13,9 +13,9 @@ #include "chrome/browser/ui/views/extensions/extension_dialog_observer.h" #include "chrome/browser/ui/views/window.h" // CreateViewsWindow #include "chrome/common/chrome_notification_types.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc index 9ab7dbc..34b799a 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.cc +++ b/chrome/browser/ui/views/extensions/extension_popup.cc @@ -14,9 +14,9 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/views/window.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "ui/views/layout/fill_layout.h" diff --git a/chrome/browser/ui/views/extensions/extension_view.cc b/chrome/browser/ui/views/extensions/extension_view.cc index a2ba9bb..ebe237a 100644 --- a/chrome/browser/ui/views/extensions/extension_view.cc +++ b/chrome/browser/ui/views/extensions/extension_view.cc @@ -6,8 +6,8 @@ #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/ui/views/extensions/extension_popup.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/content_browser_client.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" diff --git a/chrome/browser/ui/views/extensions/shell_window_views.cc b/chrome/browser/ui/views/extensions/shell_window_views.cc index 2053d68..b828c88 100644 --- a/chrome/browser/ui/views/extensions/shell_window_views.cc +++ b/chrome/browser/ui/views/extensions/shell_window_views.cc @@ -16,7 +16,7 @@ #if defined(OS_WIN) && !defined(USE_AURA) #include "chrome/browser/shell_integration.h" #include "chrome/browser/web_applications/web_app.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "ui/base/win/shell.h" #endif diff --git a/chrome/browser/ui/views/find_bar_host.cc b/chrome/browser/ui/views/find_bar_host.cc index e3dcdb9..2169b8f 100644 --- a/chrome/browser/ui/views/find_bar_host.cc +++ b/chrome/browser/ui/views/find_bar_host.cc @@ -12,7 +12,7 @@ #include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/find_bar_view.h" #include "chrome/browser/ui/views/frame/browser_view.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/chrome/browser/ui/views/find_bar_host_win.cc b/chrome/browser/ui/views/find_bar_host_win.cc index d8edd6d..1b9a0d9a 100644 --- a/chrome/browser/ui/views/find_bar_host_win.cc +++ b/chrome/browser/ui/views/find_bar_host_win.cc @@ -7,7 +7,7 @@ #include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/views/frame/browser_view.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents_view.h" #include "ui/views/controls/scrollbar/native_scroll_bar.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index a92e62d..1d98a74 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -73,9 +73,9 @@ #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index fc8636d..9db6abc 100644 --- a/chrome/browser/ui/views/hung_renderer_view.cc +++ b/chrome/browser/ui/views/hung_renderer_view.cc @@ -19,8 +19,8 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/logging_chrome.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/result_codes.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/views/notifications/balloon_view.cc b/chrome/browser/ui/views/notifications/balloon_view.cc index 5d3f636..8c48b6fc 100644 --- a/chrome/browser/ui/views/notifications/balloon_view.cc +++ b/chrome/browser/ui/views/notifications/balloon_view.cc @@ -16,10 +16,10 @@ #include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_options_menu_model.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/views/notifications/balloon_view_host.cc b/chrome/browser/ui/views/notifications/balloon_view_host.cc index 9306132..1934f82 100644 --- a/chrome/browser/ui/views/notifications/balloon_view_host.cc +++ b/chrome/browser/ui/views/notifications/balloon_view_host.cc @@ -5,8 +5,8 @@ #include "chrome/browser/ui/views/notifications/balloon_view_host.h" #include "chrome/browser/notifications/balloon.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/content_browser_client.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc index ee09b2d..37cac15 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc +++ b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc @@ -21,9 +21,9 @@ #include "chrome/browser/ui/select_file_dialog.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_view_host.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_mount_point_provider.h" diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc index c00c2f4..4f37abb 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc @@ -9,7 +9,7 @@ #include "chrome/browser/ui/sad_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_delegate.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_container.cc b/chrome/browser/ui/views/tab_contents/tab_contents_container.cc index 77ec16a..c6212db 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_container.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_container.cc @@ -8,10 +8,10 @@ #include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "ui/base/accessibility/accessible_view_state.h" diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc index 5c6d276..9a13c40 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc @@ -13,10 +13,10 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view.h" #include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_view_host_factory.h" #include "content/public/browser/interstitial_page.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc index fbb9fd2b..1a7203d 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -18,8 +18,8 @@ #include "chrome/browser/ui/views/tabs/tab_strip.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "ui/views/controls/menu/menu_item_view.h" diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index be93730..a7cac4f 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -46,10 +46,10 @@ #include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/plugin_service.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/common/content_client.h" diff --git a/chrome/browser/ui/webui/active_downloads_ui.cc b/chrome/browser/ui/webui/active_downloads_ui.cc index 0d329a8..26792ff 100644 --- a/chrome/browser/ui/webui/active_downloads_ui.cc +++ b/chrome/browser/ui/webui/active_downloads_ui.cc @@ -42,10 +42,10 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/navigation_controller.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/chromeos/idle_logout_dialog.cc b/chrome/browser/ui/webui/chromeos/idle_logout_dialog.cc index d178fcb..d4a481f 100644 --- a/chrome/browser/ui/webui/chromeos/idle_logout_dialog.cc +++ b/chrome/browser/ui/webui/chromeos/idle_logout_dialog.cc @@ -26,8 +26,8 @@ #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui_message_handler.h" #include "content/public/common/result_codes.h" diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc index 32920b7..b589907 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -30,10 +30,10 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/constrained_html_ui.cc b/chrome/browser/ui/webui/constrained_html_ui.cc index b10d921..1febb6e 100644 --- a/chrome/browser/ui/webui/constrained_html_ui.cc +++ b/chrome/browser/ui/webui/constrained_html_ui.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -14,8 +14,8 @@ #include "base/values.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc index abe7b73af..c8ee2f0 100644 --- a/chrome/browser/ui/webui/devtools_ui.cc +++ b/chrome/browser/ui/webui/devtools_ui.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -12,10 +12,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/devtools_client_host.h" #include "content/public/browser/devtools_http_handler.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/webui/html_dialog_ui.cc b/chrome/browser/ui/webui/html_dialog_ui.cc index 55c35e2..eb81689 100644 --- a/chrome/browser/ui/webui/html_dialog_ui.cc +++ b/chrome/browser/ui/webui/html_dialog_ui.cc @@ -10,8 +10,8 @@ #include "base/property_bag.h" #include "base/values.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/media/media_internals_handler.cc b/chrome/browser/ui/webui/media/media_internals_handler.cc index 63508ed..fd32399 100644 --- a/chrome/browser/ui/webui/media/media_internals_handler.cc +++ b/chrome/browser/ui/webui/media/media_internals_handler.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -9,8 +9,8 @@ #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/webui/media/media_internals_proxy.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc index 59bbbb2..77e63a8 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc @@ -18,7 +18,7 @@ #include "chrome/browser/ui/webui/web_ui_browsertest.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui_message_handler.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc index 9cfb972..4d6f97b 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc @@ -24,7 +24,7 @@ #include "chrome/browser/ui/webui/signin/login_ui_service.h" #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" #include "chrome/common/pref_names.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_ui.h" #include "grit/generated_resources.h" #include "net/base/cookie_monster.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc index c36ab5c..5b77f8e 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc @@ -24,8 +24,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_types.h" #include "chrome/browser/sync/profile_sync_service.h" -#include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/themes/theme_service.h" +#include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/webui/metrics_handler.h" #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h" @@ -34,8 +34,8 @@ #include "chrome/browser/ui/webui/ntp/most_visited_handler.h" #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" #include "chrome/browser/ui/webui/ntp/ntp_login_handler.h" -#include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h" #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h" +#include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h" #include "chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.h" #include "chrome/browser/ui/webui/ntp/suggestions_page_handler.h" #include "chrome/browser/ui/webui/theme_source.h" @@ -44,9 +44,9 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc b/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc index 3417fc8..6c3957e 100644 --- a/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc +++ b/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc @@ -14,9 +14,9 @@ #include "base/process_util.h" #include "base/string_util.h" #include "chrome/browser/tab_contents/tab_util.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" using content::BrowserThread; diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.cc b/chrome/browser/ui/webui/options/extension_settings_handler.cc index b833120..a7773b9 100644 --- a/chrome/browser/ui/webui/options/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/options/extension_settings_handler.cc @@ -32,9 +32,11 @@ #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" +#include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "grit/browser_resources.h" diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc index ee76dbf..07bf212 100644 --- a/chrome/browser/ui/webui/options/options_ui.cc +++ b/chrome/browser/ui/webui/options/options_ui.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -43,9 +43,9 @@ #include "chrome/common/jstemplate_builder.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" diff --git a/chrome/browser/ui/webui/options2/advanced_options_utils2_x11.cc b/chrome/browser/ui/webui/options2/advanced_options_utils2_x11.cc index e326145..6e026ac 100644 --- a/chrome/browser/ui/webui/options2/advanced_options_utils2_x11.cc +++ b/chrome/browser/ui/webui/options2/advanced_options_utils2_x11.cc @@ -14,9 +14,9 @@ #include "base/process_util.h" #include "base/string_util.h" #include "chrome/browser/tab_contents/tab_util.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" using content::BrowserThread; diff --git a/chrome/browser/ui/webui/options2/options_ui2.cc b/chrome/browser/ui/webui/options2/options_ui2.cc index 7bc72b8..bd7dc93 100644 --- a/chrome/browser/ui/webui/options2/options_ui2.cc +++ b/chrome/browser/ui/webui/options2/options_ui2.cc @@ -40,9 +40,9 @@ #include "chrome/common/jstemplate_builder.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_ui.h" @@ -62,8 +62,8 @@ #include "chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.h" #include "chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler2.h" #include "chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.h" -#include "chrome/browser/ui/webui/options2/chromeos/language_chewing_handler2.h" #include "chrome/browser/ui/webui/options2/chromeos/keyboard_handler2.h" +#include "chrome/browser/ui/webui/options2/chromeos/language_chewing_handler2.h" #include "chrome/browser/ui/webui/options2/chromeos/language_hangul_handler2.h" #include "chrome/browser/ui/webui/options2/chromeos/language_mozc_handler2.h" #include "chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler2.h" diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc index 016f510..0bde627 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc @@ -41,10 +41,10 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/pref_names.h" #include "chrome/common/print_messages.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/signin/login_ui_service.cc b/chrome/browser/ui/webui/signin/login_ui_service.cc index 1d96e76..ebebd1a 100644 --- a/chrome/browser/ui/webui/signin/login_ui_service.cc +++ b/chrome/browser/ui/webui/signin/login_ui_service.cc @@ -9,7 +9,7 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc index d09946b..da497f3 100644 --- a/chrome/browser/ui/webui/sync_setup_handler.cc +++ b/chrome/browser/ui/webui/sync_setup_handler.cc @@ -28,7 +28,7 @@ #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/webui/task_manager/task_manager_handler.cc b/chrome/browser/ui/webui/task_manager/task_manager_handler.cc index efac8f5..9c573c2 100644 --- a/chrome/browser/ui/webui/task_manager/task_manager_handler.cc +++ b/chrome/browser/ui/webui/task_manager/task_manager_handler.cc @@ -15,9 +15,9 @@ #include "chrome/browser/task_manager/task_manager.h" #include "chrome/browser/ui/webui/web_ui_util.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/tracing_ui.cc b/chrome/browser/ui/webui/tracing_ui.cc index 9f5bc5f..ae5b234 100644 --- a/chrome/browser/ui/webui/tracing_ui.cc +++ b/chrome/browser/ui/webui/tracing_ui.cc @@ -20,11 +20,11 @@ #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/trace_controller.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/gpu_data_manager.h" #include "content/public/browser/gpu_data_manager_observer.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/web_ui_test_handler.cc b/chrome/browser/ui/webui/web_ui_test_handler.cc index dbda5bf..1294e04 100644 --- a/chrome/browser/ui/webui/web_ui_test_handler.cc +++ b/chrome/browser/ui/webui/web_ui_test_handler.cc @@ -10,10 +10,10 @@ #include "base/values.h" #include "chrome/common/render_messages.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/visitedlink/visitedlink_event_listener.cc b/chrome/browser/visitedlink/visitedlink_event_listener.cc index c34efd8..7f50e86 100644 --- a/chrome/browser/visitedlink/visitedlink_event_listener.cc +++ b/chrome/browser/visitedlink/visitedlink_event_listener.cc @@ -7,10 +7,10 @@ #include "base/shared_memory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/render_messages.h" -#include "content/browser/renderer_host/render_widget_host.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_widget_host.h" using base::Time; using base::TimeDelta; diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index 2013264..fc57c4d 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -43,7 +43,6 @@ #include "chrome/common/extensions/extension_action.h" #include "chrome/test/automation/javascript_execution_controller.h" #include "chrome/test/base/bookmark_load_observer.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/dom_operation_notification_details.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" @@ -51,6 +50,7 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" diff --git a/chrome/test/data/webui/certificate_viewer_ui_test-inl.h b/chrome/test/data/webui/certificate_viewer_ui_test-inl.h index ac90d43..0291cf2 100644 --- a/chrome/test/data/webui/certificate_viewer_ui_test-inl.h +++ b/chrome/test/data/webui/certificate_viewer_ui_test-inl.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/certificate_viewer.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/webui/web_ui_browsertest.h" -#include "chrome/browser/certificate_viewer.h" #include "chrome/common/url_constants.h" -#include "chrome/test/base/ui_test_utils.h" #include "chrome/test/base/test_html_dialog_observer.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "chrome/test/base/ui_test_utils.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "net/base/test_certificate_data.h" diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc index d34b52d..d9cbb48 100644 --- a/chrome/test/gpu/gpu_pixel_browsertest.cc +++ b/chrome/test/gpu/gpu_pixel_browsertest.cc @@ -16,7 +16,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/test_launcher_utils.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" #include "googleurl/src/gurl.h" diff --git a/chrome/test/perf/rendering/latency_tests.cc b/chrome/test/perf/rendering/latency_tests.cc index de0f781..f7fc99c 100644 --- a/chrome/test/perf/rendering/latency_tests.cc +++ b/chrome/test/perf/rendering/latency_tests.cc @@ -21,11 +21,11 @@ #include "chrome/test/base/ui_test_utils.h" #include "chrome/test/perf/browser_perf_test.h" #include "chrome/test/perf/perf_test.h" -#include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" // Run with --vmodule=latency_tests=1 to print verbose latency info. diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc index 3fe9e9e..6d162d5 100644 --- a/content/browser/renderer_host/render_view_host.cc +++ b/content/browser/renderer_host/render_view_host.cc @@ -118,6 +118,11 @@ RenderViewHost* RenderViewHost::FromID(int render_process_id, return static_cast<RenderViewHostImpl*>(RenderWidgetHostImpl::From(widget)); } +// static +RenderViewHost* RenderViewHost::From(RenderWidgetHost* rwh) { + return static_cast<RenderViewHostImpl*>(RenderWidgetHostImpl::From(rwh)); +} + /////////////////////////////////////////////////////////////////////////////// // RenderViewHostImpl, public: diff --git a/content/browser/renderer_host/render_view_host.h b/content/browser/renderer_host/render_view_host.h index e488b39..328fc33 100644 --- a/content/browser/renderer_host/render_view_host.h +++ b/content/browser/renderer_host/render_view_host.h @@ -14,17 +14,14 @@ #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/process_util.h" -#include "base/values.h" #include "content/browser/in_process_webkit/session_storage_namespace_impl.h" #include "content/browser/renderer_host/render_widget_host.h" #include "content/browser/site_instance_impl.h" -#include "content/common/content_export.h" #include "content/public/browser/notification_observer.h" -#include "content/public/common/stop_find_action.h" +#include "content/public/browser/render_view_host.h" #include "content/public/common/window_container_type.h" #include "net/base/load_states.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h" #include "ui/base/javascript_message_type.h" @@ -32,8 +29,6 @@ #include "webkit/glue/window_open_disposition.h" class ChildProcessSecurityPolicyImpl; -class FilePath; -class GURL; class PowerSaveBlocker; class SessionStorageNamespaceImpl; class SkBitmap; @@ -44,41 +39,26 @@ struct ViewHostMsg_CreateWindow_Params; struct ViewHostMsg_ShowPopup_Params; struct ViewMsg_Navigate_Params; struct ViewMsg_StopFinding_Params; -struct WebDropData; -struct WebPreferences; namespace base { class ListValue; } namespace content { -class RenderViewHostDelegate; class RenderViewHostObserver; -class SessionStorageNamespace; struct FileChooserParams; struct ContextMenuParams; -struct CustomContextMenuContext; struct Referrer; struct ShowDesktopNotificationHostMsgParams; } -namespace gfx { -class Point; -} // namespace gfx - namespace ui { class Range; -} // namespace ui +} namespace webkit_glue { struct WebAccessibility; -} // namespace webkit_glue - -namespace WebKit { -struct WebFindOptions; -struct WebMediaPlayerAction; -struct WebPluginAction; -} // namespace WebKit +} // NotificationObserver used to listen for EXECUTE_JAVASCRIPT_RESULT // notifications. @@ -101,206 +81,6 @@ class ExecuteNotificationObserver : public content::NotificationObserver { DISALLOW_COPY_AND_ASSIGN(ExecuteNotificationObserver); }; -// TODO(joi): Put relevant bits of RWH documentation here. -// TODO(joi): Move to content namespace. -// TODO(joi): Move to separate file under content/public/browser. -class CONTENT_EXPORT RenderViewHost : virtual public RenderWidgetHost { - public: - // Returns the RenderViewHost given its ID and the ID of its render process. - // Returns NULL if the IDs do not correspond to a live RenderViewHost. - static RenderViewHost* FromID(int render_process_id, int render_view_id); - - virtual ~RenderViewHost() {} - - // Tell the render view to enable a set of javascript bindings. The argument - // should be a combination of values from BindingsPolicy. - virtual void AllowBindings(int binding_flags) = 0; - - // Tells the renderer to clear the focused node (if any). - virtual void ClearFocusedNode() = 0; - - // Causes the renderer to close the current page, including running its - // onunload event handler. A ClosePage_ACK message will be sent to the - // ResourceDispatcherHost when it is finished. - virtual void ClosePage() = 0; - - // Copies the image at location x, y to the clipboard (if there indeed is an - // image at that location). - virtual void CopyImageAt(int x, int y) = 0; - - // Sent to the renderer when a popup window should no longer count against - // the current popup count (either because it's not a popup or because it was - // a generated by a user action). - virtual void DisassociateFromPopupCount() = 0; - - // Notifies the renderer about the result of a desktop notification. - virtual void DesktopNotificationPermissionRequestDone( - int callback_context) = 0; - virtual void DesktopNotificationPostDisplay(int callback_context) = 0; - virtual void DesktopNotificationPostError(int notification_id, - const string16& message) = 0; - virtual void DesktopNotificationPostClose(int notification_id, - bool by_user) = 0; - virtual void DesktopNotificationPostClick(int notification_id) = 0; - - // Notifies the listener that a directory enumeration is complete. - virtual void DirectoryEnumerationFinished( - int request_id, - const std::vector<FilePath>& files) = 0; - - // Tells the renderer not to add scrollbars with height and width below a - // threshold. - virtual void DisableScrollbarsForThreshold(const gfx::Size& size) = 0; - - // Notifies the renderer that a a drag operation that it started has ended, - // either in a drop or by being cancelled. - virtual void DragSourceEndedAt( - int client_x, int client_y, int screen_x, int screen_y, - WebKit::WebDragOperation operation) = 0; - - // Notifies the renderer that a drag and drop operation is in progress, with - // droppable items positioned over the renderer's view. - virtual void DragSourceMovedTo( - int client_x, int client_y, int screen_x, int screen_y) = 0; - - // Notifies the renderer that we're done with the drag and drop operation. - // This allows the renderer to reset some state. - virtual void DragSourceSystemDragEnded() = 0; - - // D&d drop target messages that get sent to WebKit. - virtual void DragTargetDragEnter( - const WebDropData& drop_data, - const gfx::Point& client_pt, - const gfx::Point& screen_pt, - WebKit::WebDragOperationsMask operations_allowed) = 0; - virtual void DragTargetDragOver( - const gfx::Point& client_pt, - const gfx::Point& screen_pt, - WebKit::WebDragOperationsMask operations_allowed) = 0; - virtual void DragTargetDragLeave() = 0; - virtual void DragTargetDrop(const gfx::Point& client_pt, - const gfx::Point& screen_pt) = 0; - - // Instructs the RenderView to automatically resize and send back updates - // for the new size. - virtual void EnableAutoResize(const gfx::Size& min_size, - const gfx::Size& max_size) = 0; - - // Turns off auto-resize and gives a new size that the view should be. - virtual void DisableAutoResize(const gfx::Size& new_size) = 0; - - // Instructs the RenderView to send back updates to the preferred size. - virtual void EnablePreferredSizeMode() = 0; - - // Executes custom context menu action that was provided from WebKit. - virtual void ExecuteCustomContextMenuCommand( - int action, const content::CustomContextMenuContext& context) = 0; - - // Tells the renderer to perform the given action on the media player - // located at the given point. - virtual void ExecuteMediaPlayerActionAtLocation( - const gfx::Point& location, - const WebKit::WebMediaPlayerAction& action) = 0; - - // Runs some javascript within the context of a frame in the page. - virtual void ExecuteJavascriptInWebFrame(const string16& frame_xpath, - const string16& jscript) = 0; - - // Runs some javascript within the context of a frame in the page. The result - // is sent back via the notification EXECUTE_JAVASCRIPT_RESULT. - virtual int ExecuteJavascriptInWebFrameNotifyResult( - const string16& frame_xpath, - const string16& jscript) = 0; - - virtual Value* ExecuteJavascriptAndGetValue(const string16& frame_xpath, - const string16& jscript) = 0; - - // Tells the renderer to perform the given action on the plugin located at - // the given point. - virtual void ExecutePluginActionAtLocation( - const gfx::Point& location, const WebKit::WebPluginAction& action) = 0; - - // Asks the renderer to exit fullscreen - virtual void ExitFullscreen() = 0; - - // Finds text on a page. - virtual void Find(int request_id, const string16& search_text, - const WebKit::WebFindOptions& options) = 0; - - // Causes the renderer to invoke the onbeforeunload event handler. The - // result will be returned via ViewMsg_ShouldClose. See also ClosePage and - // SwapOut, which fire the PageUnload event. - // - // Set bool for_cross_site_transition when this close is just for the current - // RenderView in the case of a cross-site transition. False means we're - // closing the entire tab. - virtual void FirePageBeforeUnload(bool for_cross_site_transition) = 0; - - // Notifies the Listener that one or more files have been chosen by the user - // from a file chooser dialog for the form. |permissions| are flags from the - // base::PlatformFileFlags enum which specify which file permissions should - // be granted to the renderer. - virtual void FilesSelectedInChooser(const std::vector<FilePath>& files, - int permissions) = 0; - - virtual content::RenderViewHostDelegate* GetDelegate() const = 0; - - // Returns a bitwise OR of bindings types that have been enabled for this - // RenderView. See BindingsPolicy for details. - virtual int GetEnabledBindings() const = 0; - - virtual content::SessionStorageNamespace* GetSessionStorageNamespace() = 0; - - virtual content::SiteInstance* GetSiteInstance() const = 0; - - // Requests the renderer to evaluate an xpath to a frame and insert css - // into that frame's document. - virtual void InsertCSS(const string16& frame_xpath, - const std::string& css) = 0; - - // Returns true if the RenderView is active and has not crashed. Virtual - // because it is overridden by TestRenderViewHost. - virtual bool IsRenderViewLive() const = 0; - - // Let the renderer know that the menu has been closed. - virtual void NotifyContextMenuClosed( - const content::CustomContextMenuContext& context) = 0; - - // Notification that a move or resize renderer's containing window has - // started. - virtual void NotifyMoveOrResizeStarted() = 0; - - // Reloads the current focused frame. - virtual void ReloadFrame() = 0; - - // Sets the alternate error page URL (link doctor) for the renderer process. - virtual void SetAltErrorPageURL(const GURL& url) = 0; - - // Sets a property with the given name and value on the Web UI binding object. - // Must call AllowWebUIBindings() on this renderer first. - virtual void SetWebUIProperty(const std::string& name, - const std::string& value) = 0; - - // Set the zoom level for the current main frame - virtual void SetZoomLevel(double level) = 0; - - // Notifies the renderer that the user has closed the FindInPage window - // (and what action to take regarding the selection). - virtual void StopFinding(content::StopFindAction action) = 0; - - // Send the renderer process the current preferences supplied by the - // RenderViewHostDelegate. - virtual void SyncRendererPrefs() = 0; - - virtual void ToggleSpeechInput() = 0; - - // Passes a list of Webkit preferences to the renderer. - virtual void UpdateWebkitPreferences(const WebPreferences& prefs) = 0; - - // Changes the zoom level for the current main frame. - virtual void Zoom(content::PageZoom zoom) = 0; -}; - #if defined(COMPILER_MSVC) // RenderViewHostImpl is the bottom of a diamond-shaped hierarchy, // with RenderWidgetHost at the root. VS warns when methods from the @@ -313,33 +93,23 @@ class CONTENT_EXPORT RenderViewHost : virtual public RenderWidgetHost { #pragma warning(disable: 4250) #endif +// This implements the RenderViewHost interface that is exposed to +// embedders of content, and adds things only visible to content. // -// RenderViewHostImpl -// -// A RenderViewHost is responsible for creating and talking to a RenderView -// object in a child process. It exposes a high level API to users, for things -// like loading pages, adjusting the display and other browser functionality, -// which it translates into IPC messages sent over the IPC channel with the -// RenderView. It responds to all IPC messages sent by that RenderView and -// cracks them, calling a delegate object back with higher level types where -// possible. +// The exact API of this object needs to be more thoroughly designed. Right +// now it mimics what TabContents exposed, which is a fairly large API and may +// contain things that are not relevant to a common subset of views. See also +// the comment in render_view_host_delegate.h about the size and scope of the +// delegate API. // -// The intent of this class is to provide a view-agnostic communication -// conduit with a renderer. This is so we can build HTML views not only as -// TabContents (see TabContents for an example) but also as views, etc. +// Right now, the concept of page navigation (both top level and frame) exists +// in the TabContents still, so if you instantiate one of these elsewhere, you +// will not be able to traverse pages back and forward. We need to determine +// if we want to bring that and other functionality down into this object so +// it can be shared by others. // -// The exact API of this object needs to be more thoroughly designed. Right -// now it mimics what TabContents exposed, which is a fairly large API and may -// contain things that are not relevant to a common subset of views. See also -// the comment in render_view_host_delegate.h about the size and scope of the -// delegate API. -// -// Right now, the concept of page navigation (both top level and frame) exists -// in the TabContents still, so if you instantiate one of these elsewhere, you -// will not be able to traverse pages back and forward. We need to determine -// if we want to bring that and other functionality down into this object so -// it can be shared by others. // TODO(joi): Move to content namespace. +// TODO(joi): Move to file render_view_host_impl.h/cc class CONTENT_EXPORT RenderViewHostImpl : public RenderViewHost, public RenderWidgetHostImpl { @@ -419,6 +189,7 @@ class CONTENT_EXPORT RenderViewHostImpl virtual void ExitFullscreen() OVERRIDE; virtual void Find(int request_id, const string16& search_text, const WebKit::WebFindOptions& options) OVERRIDE; + virtual void StopFinding(content::StopFindAction action) OVERRIDE; virtual void FirePageBeforeUnload(bool for_cross_site_transition) OVERRIDE; virtual void FilesSelectedInChooser(const std::vector<FilePath>& files, int permissions) OVERRIDE; @@ -438,11 +209,10 @@ class CONTENT_EXPORT RenderViewHostImpl virtual void SetWebUIProperty(const std::string& name, const std::string& value) OVERRIDE; virtual void SetZoomLevel(double level) OVERRIDE; - virtual void StopFinding(content::StopFindAction action) OVERRIDE; + virtual void Zoom(content::PageZoom zoom) OVERRIDE; virtual void SyncRendererPrefs() OVERRIDE; virtual void ToggleSpeechInput() OVERRIDE; virtual void UpdateWebkitPreferences(const WebPreferences& prefs) OVERRIDE; - virtual void Zoom(content::PageZoom zoom) OVERRIDE; void set_delegate(content::RenderViewHostDelegate* d) { CHECK(d); // http://crbug.com/82827 diff --git a/content/browser/renderer_host/render_widget_host.h b/content/browser/renderer_host/render_widget_host.h index 8e7863b..9351c693 100644 --- a/content/browser/renderer_host/render_widget_host.h +++ b/content/browser/renderer_host/render_widget_host.h @@ -19,28 +19,13 @@ #include "base/string16.h" #include "base/timer.h" #include "build/build_config.h" -#include "content/common/content_export.h" -#include "content/public/browser/native_web_keyboard_event.h" +#include "content/public/browser/render_widget_host.h" #include "content/public/common/page_zoom.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" #include "ui/base/ime/text_input_type.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" -#include "ui/gfx/surface/transport_dib.h" - -#if defined(TOOLKIT_GTK) -#include "ui/base/x/x11_util.h" -#elif defined(OS_MACOSX) -#include "skia/ext/platform_device.h" -#endif class BackingStore; struct EditCommand; -class RenderViewHost; -class RenderWidgetHostImpl; -class TransportDIB; struct ViewHostMsg_UpdateRect_Params; class WebCursor; @@ -49,19 +34,9 @@ class TimeTicks; } namespace content { -class RenderProcessHost; -class RenderWidgetHostView; class RenderWidgetHostViewPort; } -namespace gfx { -class Rect; -} - -namespace skia { -class PlatformCanvas; -} - namespace ui { class Range; } @@ -73,268 +48,12 @@ struct WebCompositionUnderline; struct WebScreenInfo; } -// TODO(joi): Extract relevant bit of class documentation from -// RenderWidgetHostImpl documentation. TODO(joi): Move to -// content/public/browser/render_widget_host.h +// This implements the RenderWidgetHost interface that is exposed to +// embedders of content, and adds things only visible to content. // -// TODO(joi): Once I finish defining this interface (once -// RenderViewHost interface is also in place), group together -// implementation functions in subclasses. +// TODO(joi): Move to content namespace. // // TODO(joi): Move to file render_widget_host_impl.h -class CONTENT_EXPORT RenderWidgetHost : public IPC::Channel::Sender { - public: - virtual ~RenderWidgetHost() {} - - // Edit operations. - virtual void Undo() = 0; - virtual void Redo() = 0; - virtual void Cut() = 0; - virtual void Copy() = 0; - virtual void CopyToFindPboard() = 0; - virtual void Paste() = 0; - virtual void PasteAndMatchStyle() = 0; - virtual void Delete() = 0; - virtual void SelectAll() = 0; - - // Update the text direction of the focused input element and notify it to a - // renderer process. - // These functions have two usage scenarios: changing the text direction - // from a menu (as Safari does), and; changing the text direction when a user - // presses a set of keys (as IE and Firefox do). - // 1. Change the text direction from a menu. - // In this scenario, we receive a menu event only once and we should update - // the text direction immediately when a user chooses a menu item. So, we - // should call both functions at once as listed in the following snippet. - // void RenderViewHost::SetTextDirection(WebTextDirection direction) { - // UpdateTextDirection(direction); - // NotifyTextDirection(); - // } - // 2. Change the text direction when pressing a set of keys. - // Because of auto-repeat, we may receive the same key-press event many - // times while we presses the keys and it is nonsense to send the same IPC - // message every time when we receive a key-press event. - // To suppress the number of IPC messages, we just update the text direction - // when receiving a key-press event and send an IPC message when we release - // the keys as listed in the following snippet. - // if (key_event.type == WebKeyboardEvent::KEY_DOWN) { - // if (key_event.windows_key_code == 'A' && - // key_event.modifiers == WebKeyboardEvent::CTRL_KEY) { - // UpdateTextDirection(dir); - // } else { - // CancelUpdateTextDirection(); - // } - // } else if (key_event.type == WebKeyboardEvent::KEY_UP) { - // NotifyTextDirection(); - // } - // Once we cancel updating the text direction, we have to ignore all - // succeeding UpdateTextDirection() requests until calling - // NotifyTextDirection(). (We may receive keydown events even after we - // canceled updating the text direction because of auto-repeat.) - // Note: we cannot undo this change for compatibility with Firefox and IE. - virtual void UpdateTextDirection(WebKit::WebTextDirection direction) = 0; - virtual void NotifyTextDirection() = 0; - - virtual void Blur() = 0; - - // Copies the contents of the backing store into the given (uninitialized) - // PlatformCanvas. Returns true on success, false otherwise. - virtual bool CopyFromBackingStore(skia::PlatformCanvas* output) = 0; - -#if defined(TOOLKIT_GTK) - // Paint the backing store into the target's |dest_rect|. - virtual bool CopyFromBackingStoreToGtkWindow(const gfx::Rect& dest_rect, - GdkWindow* target) = 0; -#elif defined(OS_MACOSX) - virtual gfx::Size GetBackingStoreSize() = 0; - virtual bool CopyFromBackingStoreToCGContext(const CGRect& dest_rect, - CGContextRef target) = 0; -#endif - - // Enable renderer accessibility. This should only be called when a - // screenreader is detected. - virtual void EnableRendererAccessibility() = 0; - - // Forwards the given message to the renderer. These are called by - // the view when it has received a message. - virtual void ForwardMouseEvent( - const WebKit::WebMouseEvent& mouse_event) = 0; - virtual void ForwardWheelEvent( - const WebKit::WebMouseWheelEvent& wheel_event) = 0; - virtual void ForwardKeyboardEvent( - const NativeWebKeyboardEvent& key_event) = 0; - - virtual const gfx::Point& GetLastScrollOffset() const = 0; - - virtual content::RenderProcessHost* GetProcess() const = 0; - - virtual int GetRoutingID() const = 0; - - // Gets the View of this RenderWidgetHost. Can be NULL, e.g. if the - // RenderWidget is being destroyed or the render process crashed. You should - // never cache this pointer since it can become NULL if the renderer crashes, - // instead you should always ask for it using the accessor. - virtual content::RenderWidgetHostView* GetView() const = 0; - - // Returns true if this is a RenderViewHost, false if not. - virtual bool IsRenderView() const = 0; - - // Used as the details object for a - // RENDER_WIDGET_HOST_DID_RECEIVE_PAINT_AT_SIZE_ACK notification. - // TODO(joi): Switch out for a std::pair. - struct PaintAtSizeAckDetails { - // The tag that was passed to the PaintAtSize() call that triggered this - // ack. - int tag; - gfx::Size size; - }; - - // This tells the renderer to paint into a bitmap and return it, - // regardless of whether the tab is hidden or not. It resizes the - // web widget to match the |page_size| and then returns the bitmap - // scaled so it matches the |desired_size|, so that the scaling - // happens on the rendering thread. When the bitmap is ready, the - // renderer sends a PaintAtSizeACK to this host, and a - // RENDER_WIDGET_HOST_DID_RECEIVE_PAINT_AT_SIZE_ACK notification is issued. - // Note that this bypasses most of the update logic that is normally invoked, - // and doesn't put the results into the backing store. - virtual void PaintAtSize(TransportDIB::Handle dib_handle, - int tag, - const gfx::Size& page_size, - const gfx::Size& desired_size) = 0; - - // Makes an IPC call to tell webkit to replace the currently selected word - // or a word around the cursor. - virtual void Replace(const string16& word) = 0; - - // Called to notify the RenderWidget that the resize rect has changed without - // the size of the RenderWidget itself changing. - virtual void ResizeRectChanged(const gfx::Rect& new_rect) = 0; - - // Restart the active hang monitor timeout. Clears all existing timeouts and - // starts with a new one. This can be because the renderer has become - // active, the tab is being hidden, or the user has chosen to wait some more - // to give the tab a chance to become active and we don't want to display a - // warning too soon. - virtual void RestartHangMonitorTimeout() = 0; - - virtual void SetIgnoreInputEvents(bool ignore_input_events) = 0; - - // Stops loading the page. - virtual void Stop() = 0; - - // Called to notify the RenderWidget that it has been resized. - virtual void WasResized() = 0; - - // Access to the implementation's - // IPC::Channel::Listener::OnMessageReceived. Intended only for - // test code. - - // TODO(joi): Remove this and convert the single test using it to - // get the TabContentsWrapper from - // browser()->GetSelectedWebContents() and then call its - // translate_tab_helper() to get at the object that dispatches its - // method. - virtual bool OnMessageReceivedForTesting(const IPC::Message& msg) = 0; - - // Gets a RenderVidgetHost pointer from an IPC::Channel::Listener pointer. - static RenderWidgetHost* FromIPCChannelListener( - IPC::Channel::Listener* listener); - static const RenderWidgetHost* FromIPCChannelListener( - const IPC::Channel::Listener* listener); - - // Free all backing stores used for rendering to drop memory usage. - static void RemoveAllBackingStores(); - - // Returns the size of all the backing stores used for rendering - static size_t BackingStoreMemorySize(); - - protected: - friend class RenderWidgetHostImpl; - - // Retrieves the implementation class. Intended only for code - // within content/. This method is necessary because - // RenderWidgetHost is the root of a diamond inheritance pattern, so - // subclasses inherit it virtually, which removes our ability to - // static_cast to the subclass. - virtual RenderWidgetHostImpl* AsRenderWidgetHostImpl() = 0; -}; - -// This class manages the browser side of a browser<->renderer HWND connection. -// The HWND lives in the browser process, and windows events are sent over -// IPC to the corresponding object in the renderer. The renderer paints into -// shared memory, which we transfer to a backing store and blit to the screen -// when Windows sends us a WM_PAINT message. -// -// How Shutdown Works -// -// There are two situations in which this object, a RenderWidgetHost, can be -// instantiated: -// -// 1. By a TabContents as the communication conduit for a rendered web page. -// The TabContents instantiates a derived class: RenderViewHost. -// 2. By a TabContents as the communication conduit for a select widget. The -// TabContents instantiates the RenderWidgetHost directly. -// -// For every TabContents there are several objects in play that need to be -// properly destroyed or cleaned up when certain events occur. -// -// - TabContents - the TabContents itself, and its associated HWND. -// - RenderViewHost - representing the communication conduit with the child -// process. -// - RenderWidgetHostView - the view of the web page content, message handler, -// and plugin root. -// -// Normally, the TabContents contains a child RenderWidgetHostView that renders -// the contents of the loaded page. It has a WS_CLIPCHILDREN style so that it -// does no painting of its own. -// -// The lifetime of the RenderWidgetHostView is tied to the render process. If -// the render process dies, the RenderWidgetHostView goes away and all -// references to it must become NULL. If the TabContents finds itself without a -// RenderWidgetHostView, it paints Sad Tab instead. -// -// RenderViewHost (a RenderWidgetHost subclass) is the conduit used to -// communicate with the RenderView and is owned by the TabContents. If the -// render process crashes, the RenderViewHost remains and restarts the render -// process if needed to continue navigation. -// -// The TabContents is itself owned by the NavigationController in which it -// resides. -// -// Some examples of how shutdown works: -// -// When a tab is closed (either by the user, the web page calling window.close, -// etc) the TabStrip destroys the associated NavigationController, which calls -// Destroy on each TabContents it owns. -// -// For a TabContents, its Destroy method tells the RenderViewHost to -// shut down the render process and die. -// -// When the render process is destroyed it destroys the View: the -// RenderWidgetHostView, which destroys its HWND and deletes that object. -// -// For select popups, the situation is a little different. The RenderWidgetHost -// associated with the select popup owns the view and itself (is responsible -// for destroying itself when the view is closed). The TabContents's only -// responsibility is to select popups is to create them when it is told to. When -// the View is destroyed via an IPC message (for when WebCore destroys the -// popup, e.g. if the user selects one of the options), or because -// WM_CANCELMODE is received by the view, the View schedules the destruction of -// the render process. However in this case since there's no TabContents -// container, when the render process is destroyed, the RenderWidgetHost just -// deletes itself, which is safe because no one else should have any references -// to it (the TabContents does not). -// -// It should be noted that the RenderViewHost, not the RenderWidgetHost, -// handles IPC messages relating to the render process going away, since the -// way a RenderViewHost (TabContents) handles the process dying is different to -// the way a select popup does. As such the RenderWidgetHostView handles these -// messages for select popups. This placement is more out of convenience than -// anything else. When the view is live, these messages are forwarded to it by -// the RenderWidgetHost's IPC message map. -// -// TODO(joi): Move to content namespace. class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, public IPC::Channel::Listener { public: diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc index 69bbc17..d56b8a0 100644 --- a/content/browser/renderer_host/test_render_view_host.cc +++ b/content/browser/renderer_host/test_render_view_host.cc @@ -100,6 +100,13 @@ bool TestRenderViewHost::IsRenderViewHostSwappedOut(RenderViewHost* rwh) { return static_cast<RenderViewHostImpl*>(rwh)->is_swapped_out(); } +// static +void TestRenderViewHost::EnableAccessibilityUpdatedNotifications( + RenderViewHost* rvh) { + static_cast<RenderViewHostImpl*>( + rvh)->set_send_accessibility_updated_notifications(true); +} + bool TestRenderViewHost::TestOnMessageReceived(const IPC::Message& msg) { return OnMessageReceived(msg); } diff --git a/content/browser/renderer_host/test_render_view_host.h b/content/browser/renderer_host/test_render_view_host.h index 3679887..a24dc08 100644 --- a/content/browser/renderer_host/test_render_view_host.h +++ b/content/browser/renderer_host/test_render_view_host.h @@ -283,6 +283,11 @@ class TestRenderViewHost : public RenderViewHostImpl { // RenderViewHostImpl::is_swapped_out() outside of content. static bool IsRenderViewHostSwappedOut(RenderViewHost* rwh); + // This removes the need to expose + // RenderViewHostImpl::set_send_accessibility_updated_notifications() + // outside of content. + static void EnableAccessibilityUpdatedNotifications(RenderViewHost* rwh); + private: FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, FilterNavigate); diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 3533667..cc2c3c40 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -94,10 +94,12 @@ 'public/browser/quota_permission_context.h', 'public/browser/render_process_host.h', 'public/browser/render_process_host_factory.h', + 'public/browser/render_view_host.h', 'public/browser/render_view_host_delegate.cc', 'public/browser/render_view_host_delegate.h', 'public/browser/render_view_host_observer.cc', 'public/browser/render_view_host_observer.h', + 'public/browser/render_widget_host.h', 'public/browser/render_widget_host_view.h', 'public/browser/render_widget_host_view_mac_delegate.h', 'public/browser/resource_context.h', diff --git a/content/public/browser/render_view_host.h b/content/public/browser/render_view_host.h new file mode 100644 index 0000000..df7f6ad --- /dev/null +++ b/content/public/browser/render_view_host.h @@ -0,0 +1,253 @@ +// Copyright (c) 2012 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 CONTENT_PUBLIC_BROWSER_RENDER_VIEW_HOST_H_ +#define CONTENT_PUBLIC_BROWSER_RENDER_VIEW_HOST_H_ +#pragma once + +#include "base/values.h" +#include "content/common/content_export.h" +#include "content/public/browser/render_widget_host.h" +#include "content/public/common/page_zoom.h" +#include "content/public/common/stop_find_action.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" + +class FilePath; +class GURL; +struct WebDropData; +struct WebPreferences; + +namespace content { +class RenderViewHostDelegate; +class SessionStorageNamespace; +class SiteInstance; +struct CustomContextMenuContext; +} + +namespace gfx { +class Point; +} + +namespace WebKit { +struct WebFindOptions; +struct WebMediaPlayerAction; +struct WebPluginAction; +} + +// A RenderViewHost is responsible for creating and talking to a RenderView +// object in a child process. It exposes a high level API to users, for things +// like loading pages, adjusting the display and other browser functionality, +// which it translates into IPC messages sent over the IPC channel with the +// RenderView. It responds to all IPC messages sent by that RenderView and +// cracks them, calling a delegate object back with higher level types where +// possible. +// +// The intent of this interface is to provide a view-agnostic communication +// conduit with a renderer. This is so we can build HTML views not only as +// TabContents (see TabContents for an example) but also as views, etc. +// +// TODO(joi): Move to content namespace. +class CONTENT_EXPORT RenderViewHost : virtual public RenderWidgetHost { + public: + // Returns the RenderViewHost given its ID and the ID of its render process. + // Returns NULL if the IDs do not correspond to a live RenderViewHost. + static RenderViewHost* FromID(int render_process_id, int render_view_id); + + // Downcasts from a RenderWidgetHost to a RenderViewHost. Required + // because RenderWidgetHost is a virtual base class. + static RenderViewHost* From(RenderWidgetHost* rwh); + + virtual ~RenderViewHost() {} + + // Tell the render view to enable a set of javascript bindings. The argument + // should be a combination of values from BindingsPolicy. + virtual void AllowBindings(int binding_flags) = 0; + + // Tells the renderer to clear the focused node (if any). + virtual void ClearFocusedNode() = 0; + + // Causes the renderer to close the current page, including running its + // onunload event handler. A ClosePage_ACK message will be sent to the + // ResourceDispatcherHost when it is finished. + virtual void ClosePage() = 0; + + // Copies the image at location x, y to the clipboard (if there indeed is an + // image at that location). + virtual void CopyImageAt(int x, int y) = 0; + + // Sent to the renderer when a popup window should no longer count against + // the current popup count (either because it's not a popup or because it was + // a generated by a user action). + virtual void DisassociateFromPopupCount() = 0; + + // Notifies the renderer about the result of a desktop notification. + virtual void DesktopNotificationPermissionRequestDone( + int callback_context) = 0; + virtual void DesktopNotificationPostDisplay(int callback_context) = 0; + virtual void DesktopNotificationPostError(int notification_id, + const string16& message) = 0; + virtual void DesktopNotificationPostClose(int notification_id, + bool by_user) = 0; + virtual void DesktopNotificationPostClick(int notification_id) = 0; + + // Notifies the listener that a directory enumeration is complete. + virtual void DirectoryEnumerationFinished( + int request_id, + const std::vector<FilePath>& files) = 0; + + // Tells the renderer not to add scrollbars with height and width below a + // threshold. + virtual void DisableScrollbarsForThreshold(const gfx::Size& size) = 0; + + // Notifies the renderer that a a drag operation that it started has ended, + // either in a drop or by being cancelled. + virtual void DragSourceEndedAt( + int client_x, int client_y, int screen_x, int screen_y, + WebKit::WebDragOperation operation) = 0; + + // Notifies the renderer that a drag and drop operation is in progress, with + // droppable items positioned over the renderer's view. + virtual void DragSourceMovedTo( + int client_x, int client_y, int screen_x, int screen_y) = 0; + + // Notifies the renderer that we're done with the drag and drop operation. + // This allows the renderer to reset some state. + virtual void DragSourceSystemDragEnded() = 0; + + // D&d drop target messages that get sent to WebKit. + virtual void DragTargetDragEnter( + const WebDropData& drop_data, + const gfx::Point& client_pt, + const gfx::Point& screen_pt, + WebKit::WebDragOperationsMask operations_allowed) = 0; + virtual void DragTargetDragOver( + const gfx::Point& client_pt, + const gfx::Point& screen_pt, + WebKit::WebDragOperationsMask operations_allowed) = 0; + virtual void DragTargetDragLeave() = 0; + virtual void DragTargetDrop(const gfx::Point& client_pt, + const gfx::Point& screen_pt) = 0; + + // Instructs the RenderView to automatically resize and send back updates + // for the new size. + virtual void EnableAutoResize(const gfx::Size& min_size, + const gfx::Size& max_size) = 0; + + // Turns off auto-resize and gives a new size that the view should be. + virtual void DisableAutoResize(const gfx::Size& new_size) = 0; + + // Instructs the RenderView to send back updates to the preferred size. + virtual void EnablePreferredSizeMode() = 0; + + // Executes custom context menu action that was provided from WebKit. + virtual void ExecuteCustomContextMenuCommand( + int action, const content::CustomContextMenuContext& context) = 0; + + // Tells the renderer to perform the given action on the media player + // located at the given point. + virtual void ExecuteMediaPlayerActionAtLocation( + const gfx::Point& location, + const WebKit::WebMediaPlayerAction& action) = 0; + + // Runs some javascript within the context of a frame in the page. + virtual void ExecuteJavascriptInWebFrame(const string16& frame_xpath, + const string16& jscript) = 0; + + // Runs some javascript within the context of a frame in the page. The result + // is sent back via the notification EXECUTE_JAVASCRIPT_RESULT. + virtual int ExecuteJavascriptInWebFrameNotifyResult( + const string16& frame_xpath, + const string16& jscript) = 0; + + virtual Value* ExecuteJavascriptAndGetValue(const string16& frame_xpath, + const string16& jscript) = 0; + + // Tells the renderer to perform the given action on the plugin located at + // the given point. + virtual void ExecutePluginActionAtLocation( + const gfx::Point& location, const WebKit::WebPluginAction& action) = 0; + + // Asks the renderer to exit fullscreen + virtual void ExitFullscreen() = 0; + + // Finds text on a page. + virtual void Find(int request_id, const string16& search_text, + const WebKit::WebFindOptions& options) = 0; + + // Notifies the renderer that the user has closed the FindInPage window + // (and what action to take regarding the selection). + virtual void StopFinding(content::StopFindAction action) = 0; + + // Causes the renderer to invoke the onbeforeunload event handler. The + // result will be returned via ViewMsg_ShouldClose. See also ClosePage and + // SwapOut, which fire the PageUnload event. + // + // Set bool for_cross_site_transition when this close is just for the current + // RenderView in the case of a cross-site transition. False means we're + // closing the entire tab. + virtual void FirePageBeforeUnload(bool for_cross_site_transition) = 0; + + // Notifies the Listener that one or more files have been chosen by the user + // from a file chooser dialog for the form. |permissions| are flags from the + // base::PlatformFileFlags enum which specify which file permissions should + // be granted to the renderer. + virtual void FilesSelectedInChooser(const std::vector<FilePath>& files, + int permissions) = 0; + + virtual content::RenderViewHostDelegate* GetDelegate() const = 0; + + // Returns a bitwise OR of bindings types that have been enabled for this + // RenderView. See BindingsPolicy for details. + virtual int GetEnabledBindings() const = 0; + + virtual content::SessionStorageNamespace* GetSessionStorageNamespace() = 0; + + virtual content::SiteInstance* GetSiteInstance() const = 0; + + // Requests the renderer to evaluate an xpath to a frame and insert css + // into that frame's document. + virtual void InsertCSS(const string16& frame_xpath, + const std::string& css) = 0; + + // Returns true if the RenderView is active and has not crashed. Virtual + // because it is overridden by TestRenderViewHost. + virtual bool IsRenderViewLive() const = 0; + + // Let the renderer know that the menu has been closed. + virtual void NotifyContextMenuClosed( + const content::CustomContextMenuContext& context) = 0; + + // Notification that a move or resize renderer's containing window has + // started. + virtual void NotifyMoveOrResizeStarted() = 0; + + // Reloads the current focused frame. + virtual void ReloadFrame() = 0; + + // Sets the alternate error page URL (link doctor) for the renderer process. + virtual void SetAltErrorPageURL(const GURL& url) = 0; + + // Sets a property with the given name and value on the Web UI binding object. + // Must call AllowWebUIBindings() on this renderer first. + virtual void SetWebUIProperty(const std::string& name, + const std::string& value) = 0; + + // Set the zoom level for the current main frame + virtual void SetZoomLevel(double level) = 0; + + // Changes the zoom level for the current main frame. + virtual void Zoom(content::PageZoom zoom) = 0; + + // Send the renderer process the current preferences supplied by the + // RenderViewHostDelegate. + virtual void SyncRendererPrefs() = 0; + + virtual void ToggleSpeechInput() = 0; + + // Passes a list of Webkit preferences to the renderer. + virtual void UpdateWebkitPreferences(const WebPreferences& prefs) = 0; +}; + + +#endif // CONTENT_PUBLIC_BROWSER_RENDER_VIEW_HOST_H_ diff --git a/content/public/browser/render_widget_host.h b/content/public/browser/render_widget_host.h new file mode 100644 index 0000000..39c0535 --- /dev/null +++ b/content/public/browser/render_widget_host.h @@ -0,0 +1,290 @@ +// Copyright (c) 2012 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 CONTENT_PUBLIC_BROWSER_RENDER_WIDGET_HOST_H_ +#define CONTENT_PUBLIC_BROWSER_RENDER_WIDGET_HOST_H_ +#pragma once + +#include "content/common/content_export.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" +#include "ui/gfx/size.h" +#include "ui/gfx/surface/transport_dib.h" + +#if defined(TOOLKIT_GTK) +#include "ui/base/x/x11_util.h" +#elif defined(OS_MACOSX) +#include "skia/ext/platform_device.h" +#endif + +class RenderWidgetHostImpl; + +namespace content { +class RenderProcessHost; +class RenderWidgetHostView; +} + +namespace gfx { +class Rect; +} + +namespace skia { +class PlatformCanvas; +} + +// A RenderWidgetHost manages the browser side of a browser<->renderer +// HWND connection. The HWND lives in the browser process, and +// windows events are sent over IPC to the corresponding object in the +// renderer. The renderer paints into shared memory, which we +// transfer to a backing store and blit to the screen when Windows +// sends us a WM_PAINT message. +// +// How Shutdown Works +// +// There are two situations in which this object, a RenderWidgetHost, can be +// instantiated: +// +// 1. By a TabContents as the communication conduit for a rendered web page. +// The TabContents instantiates a derived class: RenderViewHost. +// 2. By a TabContents as the communication conduit for a select widget. The +// TabContents instantiates the RenderWidgetHost directly. +// +// For every TabContents there are several objects in play that need to be +// properly destroyed or cleaned up when certain events occur. +// +// - TabContents - the TabContents itself, and its associated HWND. +// - RenderViewHost - representing the communication conduit with the child +// process. +// - RenderWidgetHostView - the view of the web page content, message handler, +// and plugin root. +// +// Normally, the TabContents contains a child RenderWidgetHostView that renders +// the contents of the loaded page. It has a WS_CLIPCHILDREN style so that it +// does no painting of its own. +// +// The lifetime of the RenderWidgetHostView is tied to the render process. If +// the render process dies, the RenderWidgetHostView goes away and all +// references to it must become NULL. If the TabContents finds itself without a +// RenderWidgetHostView, it paints Sad Tab instead. +// +// RenderViewHost (a RenderWidgetHost subclass) is the conduit used to +// communicate with the RenderView and is owned by the TabContents. If the +// render process crashes, the RenderViewHost remains and restarts the render +// process if needed to continue navigation. +// +// The TabContents is itself owned by the NavigationController in which it +// resides. +// +// Some examples of how shutdown works: +// +// When a tab is closed (either by the user, the web page calling window.close, +// etc) the TabStrip destroys the associated NavigationController, which calls +// Destroy on each TabContents it owns. +// +// For a TabContents, its Destroy method tells the RenderViewHost to +// shut down the render process and die. +// +// When the render process is destroyed it destroys the View: the +// RenderWidgetHostView, which destroys its HWND and deletes that object. +// +// For select popups, the situation is a little different. The RenderWidgetHost +// associated with the select popup owns the view and itself (is responsible +// for destroying itself when the view is closed). The TabContents's only +// responsibility is to select popups is to create them when it is told to. When +// the View is destroyed via an IPC message (for when WebCore destroys the +// popup, e.g. if the user selects one of the options), or because +// WM_CANCELMODE is received by the view, the View schedules the destruction of +// the render process. However in this case since there's no TabContents +// container, when the render process is destroyed, the RenderWidgetHost just +// deletes itself, which is safe because no one else should have any references +// to it (the TabContents does not). +// +// It should be noted that the RenderViewHost, not the RenderWidgetHost, +// handles IPC messages relating to the render process going away, since the +// way a RenderViewHost (TabContents) handles the process dying is different to +// the way a select popup does. As such the RenderWidgetHostView handles these +// messages for select popups. This placement is more out of convenience than +// anything else. When the view is live, these messages are forwarded to it by +// the RenderWidgetHost's IPC message map. +class CONTENT_EXPORT RenderWidgetHost : public IPC::Channel::Sender { + public: + // Gets a RenderVidgetHost pointer from an IPC::Channel::Listener pointer. + static RenderWidgetHost* FromIPCChannelListener( + IPC::Channel::Listener* listener); + static const RenderWidgetHost* FromIPCChannelListener( + const IPC::Channel::Listener* listener); + + // Free all backing stores used for rendering to drop memory usage. + static void RemoveAllBackingStores(); + + // Returns the size of all the backing stores used for rendering + static size_t BackingStoreMemorySize(); + + virtual ~RenderWidgetHost() {} + + // Edit operations. + virtual void Undo() = 0; + virtual void Redo() = 0; + virtual void Cut() = 0; + virtual void Copy() = 0; + virtual void CopyToFindPboard() = 0; + virtual void Paste() = 0; + virtual void PasteAndMatchStyle() = 0; + virtual void Delete() = 0; + virtual void SelectAll() = 0; + + // Update the text direction of the focused input element and notify it to a + // renderer process. + // These functions have two usage scenarios: changing the text direction + // from a menu (as Safari does), and; changing the text direction when a user + // presses a set of keys (as IE and Firefox do). + // 1. Change the text direction from a menu. + // In this scenario, we receive a menu event only once and we should update + // the text direction immediately when a user chooses a menu item. So, we + // should call both functions at once as listed in the following snippet. + // void RenderViewHost::SetTextDirection(WebTextDirection direction) { + // UpdateTextDirection(direction); + // NotifyTextDirection(); + // } + // 2. Change the text direction when pressing a set of keys. + // Because of auto-repeat, we may receive the same key-press event many + // times while we presses the keys and it is nonsense to send the same IPC + // message every time when we receive a key-press event. + // To suppress the number of IPC messages, we just update the text direction + // when receiving a key-press event and send an IPC message when we release + // the keys as listed in the following snippet. + // if (key_event.type == WebKeyboardEvent::KEY_DOWN) { + // if (key_event.windows_key_code == 'A' && + // key_event.modifiers == WebKeyboardEvent::CTRL_KEY) { + // UpdateTextDirection(dir); + // } else { + // CancelUpdateTextDirection(); + // } + // } else if (key_event.type == WebKeyboardEvent::KEY_UP) { + // NotifyTextDirection(); + // } + // Once we cancel updating the text direction, we have to ignore all + // succeeding UpdateTextDirection() requests until calling + // NotifyTextDirection(). (We may receive keydown events even after we + // canceled updating the text direction because of auto-repeat.) + // Note: we cannot undo this change for compatibility with Firefox and IE. + virtual void UpdateTextDirection(WebKit::WebTextDirection direction) = 0; + virtual void NotifyTextDirection() = 0; + + virtual void Blur() = 0; + + // Copies the contents of the backing store into the given (uninitialized) + // PlatformCanvas. Returns true on success, false otherwise. + virtual bool CopyFromBackingStore(skia::PlatformCanvas* output) = 0; + +#if defined(TOOLKIT_GTK) + // Paint the backing store into the target's |dest_rect|. + virtual bool CopyFromBackingStoreToGtkWindow(const gfx::Rect& dest_rect, + GdkWindow* target) = 0; +#elif defined(OS_MACOSX) + virtual gfx::Size GetBackingStoreSize() = 0; + virtual bool CopyFromBackingStoreToCGContext(const CGRect& dest_rect, + CGContextRef target) = 0; +#endif + + // Enable renderer accessibility. This should only be called when a + // screenreader is detected. + virtual void EnableRendererAccessibility() = 0; + + // Forwards the given message to the renderer. These are called by + // the view when it has received a message. + virtual void ForwardMouseEvent( + const WebKit::WebMouseEvent& mouse_event) = 0; + virtual void ForwardWheelEvent( + const WebKit::WebMouseWheelEvent& wheel_event) = 0; + virtual void ForwardKeyboardEvent( + const NativeWebKeyboardEvent& key_event) = 0; + + virtual const gfx::Point& GetLastScrollOffset() const = 0; + + virtual content::RenderProcessHost* GetProcess() const = 0; + + virtual int GetRoutingID() const = 0; + + // Gets the View of this RenderWidgetHost. Can be NULL, e.g. if the + // RenderWidget is being destroyed or the render process crashed. You should + // never cache this pointer since it can become NULL if the renderer crashes, + // instead you should always ask for it using the accessor. + virtual content::RenderWidgetHostView* GetView() const = 0; + + // Returns true if this is a RenderViewHost, false if not. + virtual bool IsRenderView() const = 0; + + // Used as the details object for a + // RENDER_WIDGET_HOST_DID_RECEIVE_PAINT_AT_SIZE_ACK notification. + // TODO(joi): Switch out for a std::pair. + struct PaintAtSizeAckDetails { + // The tag that was passed to the PaintAtSize() call that triggered this + // ack. + int tag; + gfx::Size size; + }; + + // This tells the renderer to paint into a bitmap and return it, + // regardless of whether the tab is hidden or not. It resizes the + // web widget to match the |page_size| and then returns the bitmap + // scaled so it matches the |desired_size|, so that the scaling + // happens on the rendering thread. When the bitmap is ready, the + // renderer sends a PaintAtSizeACK to this host, and a + // RENDER_WIDGET_HOST_DID_RECEIVE_PAINT_AT_SIZE_ACK notification is issued. + // Note that this bypasses most of the update logic that is normally invoked, + // and doesn't put the results into the backing store. + virtual void PaintAtSize(TransportDIB::Handle dib_handle, + int tag, + const gfx::Size& page_size, + const gfx::Size& desired_size) = 0; + + // Makes an IPC call to tell webkit to replace the currently selected word + // or a word around the cursor. + virtual void Replace(const string16& word) = 0; + + // Called to notify the RenderWidget that the resize rect has changed without + // the size of the RenderWidget itself changing. + virtual void ResizeRectChanged(const gfx::Rect& new_rect) = 0; + + // Restart the active hang monitor timeout. Clears all existing timeouts and + // starts with a new one. This can be because the renderer has become + // active, the tab is being hidden, or the user has chosen to wait some more + // to give the tab a chance to become active and we don't want to display a + // warning too soon. + virtual void RestartHangMonitorTimeout() = 0; + + virtual void SetIgnoreInputEvents(bool ignore_input_events) = 0; + + // Stops loading the page. + virtual void Stop() = 0; + + // Called to notify the RenderWidget that it has been resized. + virtual void WasResized() = 0; + + // Access to the implementation's + // IPC::Channel::Listener::OnMessageReceived. Intended only for + // test code. + + // TODO(joi): Remove this and convert the single test using it to + // get the TabContentsWrapper from + // browser()->GetSelectedWebContents() and then call its + // translate_tab_helper() to get at the object that dispatches its + // method. + virtual bool OnMessageReceivedForTesting(const IPC::Message& msg) = 0; + + protected: + friend class RenderWidgetHostImpl; + + // Retrieves the implementation class. Intended only for code + // within content/. This method is necessary because + // RenderWidgetHost is the root of a diamond inheritance pattern, so + // subclasses inherit it virtually, which removes our ability to + // static_cast to the subclass. + virtual RenderWidgetHostImpl* AsRenderWidgetHostImpl() = 0; +}; + +#endif // CONTENT_PUBLIC_BROWSER_RENDER_WIDGET_HOST_H_ |