diff options
Diffstat (limited to 'content/browser')
8 files changed, 12 insertions, 12 deletions
diff --git a/content/browser/renderer_host/render_process_host.cc b/content/browser/renderer_host/render_process_host.cc index 251f3bb..50fac3f 100644 --- a/content/browser/renderer_host/render_process_host.cc +++ b/content/browser/renderer_host/render_process_host.cc @@ -11,11 +11,11 @@ #include "content/browser/child_process_security_policy.h" #include "content/browser/webui/web_ui_factory.h" #include "content/common/child_process_info.h" -#include "content/common/content_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "content/public/common/content_constants.h" #include "content/public/common/content_switches.h" namespace { diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc index e150822..950bc56 100644 --- a/content/browser/renderer_host/render_view_host.cc +++ b/content/browser/renderer_host/render_view_host.cc @@ -30,18 +30,18 @@ #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/browser/site_instance.h" #include "content/browser/user_metrics.h" -#include "content/common/content_constants.h" #include "content/common/desktop_notification_messages.h" #include "content/common/drag_messages.h" -#include "content/public/browser/notification_service.h" #include "content/common/speech_input_messages.h" #include "content/common/swapped_out_messages.h" #include "content/common/view_messages.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/notification_details.h" +#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/common/bindings_policy.h" +#include "content/public/common/content_constants.h" #include "content/public/common/result_codes.h" #include "content/public/common/url_constants.h" #include "net/base/net_util.h" @@ -1308,8 +1308,8 @@ void RenderViewHost::SetZoomLevel(double level) { Send(new ViewMsg_SetZoomLevel(routing_id(), level)); } -void RenderViewHost::Zoom(PageZoom::Function zoom_function) { - Send(new ViewMsg_Zoom(routing_id(), zoom_function)); +void RenderViewHost::Zoom(content::PageZoom zoom) { + Send(new ViewMsg_Zoom(routing_id(), zoom)); } void RenderViewHost::ReloadFrame() { diff --git a/content/browser/renderer_host/render_view_host.h b/content/browser/renderer_host/render_view_host.h index a295822b..cb72b6c 100644 --- a/content/browser/renderer_host/render_view_host.h +++ b/content/browser/renderer_host/render_view_host.h @@ -422,7 +422,7 @@ class CONTENT_EXPORT RenderViewHost : public RenderWidgetHost { void SetZoomLevel(double level); // Changes the zoom level for the current main frame. - void Zoom(PageZoom::Function zoom_function); + void Zoom(content::PageZoom zoom); // Reloads the current focused frame. void ReloadFrame(); diff --git a/content/browser/renderer_host/render_widget_host.h b/content/browser/renderer_host/render_widget_host.h index 9c82042..e980600 100644 --- a/content/browser/renderer_host/render_widget_host.h +++ b/content/browser/renderer_host/render_widget_host.h @@ -16,9 +16,9 @@ #include "base/string16.h" #include "base/timer.h" #include "content/common/content_export.h" -#include "content/common/page_zoom.h" #include "content/common/property_bag.h" #include "content/public/browser/native_web_keyboard_event.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" diff --git a/content/browser/site_instance_unittest.cc b/content/browser/site_instance_unittest.cc index d19ef68..0185daf 100644 --- a/content/browser/site_instance_unittest.cc +++ b/content/browser/site_instance_unittest.cc @@ -15,8 +15,8 @@ #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/webui/empty_web_ui_factory.h" -#include "content/common/content_constants.h" #include "content/public/common/content_client.h" +#include "content/public/common/content_constants.h" #include "content/public/common/url_constants.h" #include "content/test/test_browser_context.h" #include "content/test/test_browser_thread.h" diff --git a/content/browser/tab_contents/navigation_controller.cc b/content/browser/tab_contents/navigation_controller.cc index c2d5185..65e90ee 100644 --- a/content/browser/tab_contents/navigation_controller.cc +++ b/content/browser/tab_contents/navigation_controller.cc @@ -20,8 +20,8 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_delegate.h" #include "content/browser/user_metrics.h" -#include "content/common/content_constants.h" #include "content/public/browser/notification_service.h" +#include "content/public/common/content_constants.h" #include "content/common/view_messages.h" #include "content/public/browser/notification_types.h" #include "net/base/escape.h" diff --git a/content/browser/tab_contents/navigation_entry.cc b/content/browser/tab_contents/navigation_entry.cc index 3e60a53b..b84050a 100644 --- a/content/browser/tab_contents/navigation_entry.cc +++ b/content/browser/tab_contents/navigation_entry.cc @@ -7,8 +7,8 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "content/browser/site_instance.h" -#include "content/common/content_constants.h" #include "content/public/browser/content_browser_client.h" +#include "content/public/common/content_constants.h" #include "content/public/common/url_constants.h" #include "net/base/net_util.h" #include "ui/base/text/text_elider.h" diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index fd84d52..0067d09 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -38,14 +38,14 @@ #include "content/browser/tab_contents/title_updated_details.h" #include "content/browser/user_metrics.h" #include "content/browser/webui/web_ui_factory.h" -#include "content/common/content_constants.h" #include "content/common/content_restriction.h" #include "content/common/intents_messages.h" -#include "content/public/browser/notification_service.h" #include "content/common/view_messages.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/navigation_types.h" +#include "content/public/browser/notification_service.h" #include "content/public/common/bindings_policy.h" +#include "content/public/common/content_constants.h" #include "content/public/common/url_constants.h" #include "content/public/common/view_types.h" #include "net/base/net_util.h" |