diff options
28 files changed, 61 insertions, 49 deletions
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index 25fde16..15b9c45 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -99,20 +99,11 @@ 'renderer/external_extension.h', 'renderer/localized_error.cc', 'renderer/localized_error.h', - 'renderer/load_progress_tracker.cc', - 'renderer/load_progress_tracker.h', - 'renderer/navigation_state.cc', - 'renderer/navigation_state.h', - 'renderer/paint_aggregator.cc', 'renderer/page_click_listener.h', 'renderer/page_click_tracker.cc', 'renderer/page_click_tracker.h', 'renderer/page_load_histograms.cc', 'renderer/page_load_histograms.h', - 'renderer/pepper_platform_context_3d_impl.cc', - 'renderer/pepper_platform_context_3d_impl.h', - 'renderer/pepper_plugin_delegate_impl.cc', - 'renderer/pepper_plugin_delegate_impl.h', 'renderer/print_web_view_helper.cc', 'renderer/print_web_view_helper.h', 'renderer/print_web_view_helper_linux.cc', @@ -213,8 +204,6 @@ 'renderer/user_script_slave.h', 'renderer/visitedlink_slave.cc', 'renderer/visitedlink_slave.h', - 'renderer/web_ui_bindings.cc', - 'renderer/web_ui_bindings.h', ], 'link_settings': { 'mac_bundle_resources': [ diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 4e042f2..9a118cc 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1751,7 +1751,6 @@ 'renderer/extensions/json_schema_unittest.cc', 'renderer/net/predictor_queue_unittest.cc', 'renderer/net/renderer_predictor_unittest.cc', - 'renderer/paint_aggregator_unittest.cc', 'renderer/render_process_unittest.cc', 'renderer/render_thread_unittest.cc', 'renderer/render_widget_unittest.cc', @@ -1840,6 +1839,7 @@ '../content/renderer/audio_message_filter_unittest.cc', '../content/renderer/gpu_video_decoder_host_unittest.cc', '../content/renderer/media/audio_renderer_impl_unittest.cc', + '../content/renderer/paint_aggregator_unittest.cc', '../testing/gtest_mac_unittest.mm', '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc', '../webkit/fileapi/file_system_dir_url_request_job_unittest.cc', diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index fe523d8..a44cc58 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -4,7 +4,9 @@ #include "chrome/renderer/chrome_content_renderer_client.h" +#include "grit/locale_settings.h" #include "grit/renderer_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" namespace chrome { @@ -13,4 +15,7 @@ SkBitmap* ChromeContentRendererClient::GetSadPluginBitmap() { return ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_SAD_PLUGIN); } +std::string ChromeContentRendererClient::GetDefaultEncoding() { + return l10n_util::GetStringUTF8(IDS_DEFAULT_ENCODING); +} } // namespace chrome diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h index 38c8d38..9e3206a 100644 --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h @@ -13,6 +13,7 @@ namespace chrome { class ChromeContentRendererClient : public content::ContentRendererClient { public: virtual SkBitmap* GetSadPluginBitmap(); + virtual std::string GetDefaultEncoding(); }; } // namespace chrome diff --git a/chrome/renderer/external_host_bindings.h b/chrome/renderer/external_host_bindings.h index 13b354a..1673f2e 100644 --- a/chrome/renderer/external_host_bindings.h +++ b/chrome/renderer/external_host_bindings.h @@ -6,7 +6,7 @@ #define CHROME_RENDERER_EXTERNAL_HOST_BINDINGS_H_ #pragma once -#include "chrome/renderer/web_ui_bindings.h" +#include "content/renderer/web_ui_bindings.h" #include "ipc/ipc_message.h" // ExternalHostBindings is the class backing the "externalHost" object diff --git a/chrome/renderer/loadtimes_extension_bindings.cc b/chrome/renderer/loadtimes_extension_bindings.cc index c9431ee..9005128 100644 --- a/chrome/renderer/loadtimes_extension_bindings.cc +++ b/chrome/renderer/loadtimes_extension_bindings.cc @@ -7,7 +7,7 @@ #include <math.h> #include "base/time.h" -#include "chrome/renderer/navigation_state.h" +#include "content/renderer/navigation_state.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "v8/include/v8.h" diff --git a/chrome/renderer/page_load_histograms.cc b/chrome/renderer/page_load_histograms.cc index 6c6239c..e092c93 100644 --- a/chrome/renderer/page_load_histograms.cc +++ b/chrome/renderer/page_load_histograms.cc @@ -9,8 +9,8 @@ #include "base/metrics/histogram.h" #include "base/time.h" #include "chrome/common/chrome_constants.h" -#include "chrome/renderer/navigation_state.h" #include "chrome/renderer/render_thread.h" +#include "content/renderer/navigation_state.h" #include "googleurl/src/gurl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPerformance.h" diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 9c440e9..5f4572c 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -58,9 +58,7 @@ #include "chrome/renderer/extensions/renderer_extension_bindings.h" #include "chrome/renderer/external_host_bindings.h" #include "chrome/renderer/external_popup_menu.h" -#include "chrome/renderer/load_progress_tracker.h" #include "chrome/renderer/localized_error.h" -#include "chrome/renderer/navigation_state.h" #include "chrome/renderer/page_click_tracker.h" #include "chrome/renderer/page_load_histograms.h" #include "chrome/renderer/print_web_view_helper.h" @@ -81,7 +79,6 @@ #include "chrome/renderer/user_script_idle_scheduler.h" #include "chrome/renderer/user_script_slave.h" #include "chrome/renderer/visitedlink_slave.h" -#include "chrome/renderer/web_ui_bindings.h" #include "content/common/appcache/appcache_dispatcher.h" #include "content/common/clipboard_messages.h" #include "content/common/content_constants.h" @@ -95,8 +92,10 @@ #include "content/renderer/device_orientation_dispatcher.h" #include "content/renderer/geolocation_dispatcher.h" #include "content/renderer/ggl.h" +#include "content/renderer/load_progress_tracker.h" #include "content/renderer/media/audio_renderer_impl.h" #include "content/renderer/media/ipc_video_decoder.h" +#include "content/renderer/navigation_state.h" #include "content/renderer/notification_provider.h" #include "content/renderer/p2p/socket_dispatcher.h" #include "content/renderer/plugin_channel_host.h" @@ -105,6 +104,7 @@ #include "content/renderer/webplugin_delegate_proxy.h" #include "content/renderer/websharedworker_proxy.h" #include "content/renderer/webworker_proxy.h" +#include "content/renderer/web_ui_bindings.h" #include "grit/generated_resources.h" #include "grit/renderer_resources.h" #include "media/base/filter_collection.h" diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index 4897294..954b952 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -28,11 +28,11 @@ #include "chrome/common/view_types.h" #include "chrome/renderer/external_popup_menu.h" #include "chrome/renderer/page_load_histograms.h" -#include "chrome/renderer/pepper_plugin_delegate_impl.h" #include "chrome/renderer/render_widget.h" #include "chrome/renderer/renderer_webcookiejar_impl.h" #include "content/common/navigation_gesture.h" #include "content/common/page_zoom.h" +#include "content/renderer/pepper_plugin_delegate_impl.h" #include "ipc/ipc_platform_file.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityNotification.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h index aecdb29..8325718 100644 --- a/chrome/renderer/render_widget.h +++ b/chrome/renderer/render_widget.h @@ -11,8 +11,8 @@ #include "app/surface/transport_dib.h" #include "base/basictypes.h" #include "base/ref_counted.h" -#include "chrome/renderer/paint_aggregator.h" #include "chrome/renderer/render_process.h" +#include "content/renderer/paint_aggregator.h" #include "ipc/ipc_channel.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" diff --git a/chrome/renderer/render_widget_fullscreen_pepper.cc b/chrome/renderer/render_widget_fullscreen_pepper.cc index 6b39afe..cd1f56a 100644 --- a/chrome/renderer/render_widget_fullscreen_pepper.cc +++ b/chrome/renderer/render_widget_fullscreen_pepper.cc @@ -5,10 +5,10 @@ #include "chrome/renderer/render_widget_fullscreen_pepper.h" #include "chrome/common/render_messages.h" -#include "chrome/renderer/pepper_platform_context_3d_impl.h" #include "chrome/renderer/render_thread.h" #include "content/renderer/ggl.h" #include "content/renderer/gpu_channel_host.h" +#include "content/renderer/pepper_platform_context_3d_impl.h" #include "gpu/command_buffer/client/gles2_implementation.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc index 1c3dbd7..05997e0 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc +++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc @@ -12,12 +12,12 @@ #include "base/scoped_callback_factory.h" #include "chrome/common/render_messages.h" #include "chrome/common/safebrowsing_messages.h" -#include "chrome/renderer/navigation_state.h" #include "chrome/renderer/render_thread.h" #include "chrome/renderer/render_view.h" #include "chrome/renderer/safe_browsing/feature_extractor_clock.h" #include "chrome/renderer/safe_browsing/phishing_classifier.h" #include "chrome/renderer/safe_browsing/scorer.h" +#include "content/renderer/navigation_state.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index 6fa2543..7dd7849 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -43,12 +43,16 @@ 'renderer/gpu_video_service_host.h', 'renderer/indexed_db_dispatcher.cc', 'renderer/indexed_db_dispatcher.h', + 'renderer/load_progress_tracker.cc', + 'renderer/load_progress_tracker.h', 'renderer/media/audio_renderer_impl.cc', 'renderer/media/audio_renderer_impl.h', 'renderer/media/gles2_video_decode_context.cc', 'renderer/media/gles2_video_decode_context.h', 'renderer/media/ipc_video_decoder.cc', 'renderer/media/ipc_video_decoder.h', + 'renderer/navigation_state.cc', + 'renderer/navigation_state.h', 'renderer/notification_provider.cc', 'renderer/notification_provider.h', 'renderer/p2p/ipc_network_manager.cc', @@ -59,6 +63,12 @@ 'renderer/p2p/socket_client.h', 'renderer/p2p/socket_dispatcher.cc', 'renderer/p2p/socket_dispatcher.h', + 'renderer/paint_aggregator.cc', + 'renderer/paint_aggregator.h', + 'renderer/pepper_platform_context_3d_impl.cc', + 'renderer/pepper_platform_context_3d_impl.h', + 'renderer/pepper_plugin_delegate_impl.cc', + 'renderer/pepper_plugin_delegate_impl.h', 'renderer/plugin_channel_host.cc', 'renderer/plugin_channel_host.h', 'renderer/speech_input_dispatcher.cc', @@ -75,6 +85,8 @@ 'renderer/webworker_base.h', 'renderer/webworker_proxy.cc', 'renderer/webworker_proxy.h', + 'renderer/web_ui_bindings.cc', + 'renderer/web_ui_bindings.h', ], 'conditions': [ ['enable_gpu==1', { diff --git a/content/renderer/content_renderer_client.cc b/content/renderer/content_renderer_client.cc index 56b2568..a247b3c 100644 --- a/content/renderer/content_renderer_client.cc +++ b/content/renderer/content_renderer_client.cc @@ -10,4 +10,8 @@ SkBitmap* ContentRendererClient::GetSadPluginBitmap() { return NULL; } +std::string ContentRendererClient::GetDefaultEncoding() { + return std::string(); +} + } // namespace content diff --git a/content/renderer/content_renderer_client.h b/content/renderer/content_renderer_client.h index 557d858..dac0af8 100644 --- a/content/renderer/content_renderer_client.h +++ b/content/renderer/content_renderer_client.h @@ -6,6 +6,8 @@ #define CONTENT_RENDERER_CONTENT_RENDERER_CLIENT_H_ #pragma once +#include <string> + #include "content/common/content_client.h" class SkBitmap; @@ -16,6 +18,7 @@ namespace content { class ContentRendererClient { public: virtual SkBitmap* GetSadPluginBitmap(); + virtual std::string GetDefaultEncoding(); }; } // namespace content diff --git a/chrome/renderer/load_progress_tracker.cc b/content/renderer/load_progress_tracker.cc index 42ce99b..aa384f6 100644 --- a/chrome/renderer/load_progress_tracker.cc +++ b/content/renderer/load_progress_tracker.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/renderer/load_progress_tracker.h" +#include "content/renderer/load_progress_tracker.h" #include "base/message_loop.h" #include "chrome/common/render_messages.h" diff --git a/chrome/renderer/load_progress_tracker.h b/content/renderer/load_progress_tracker.h index a9455c3..490bd82 100644 --- a/chrome/renderer/load_progress_tracker.h +++ b/content/renderer/load_progress_tracker.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_RENDERER_LOAD_PROGRESS_TRACKER_H_ -#define CHROME_RENDERER_LOAD_PROGRESS_TRACKER_H_ +#ifndef CONTENT_RENDERER_LOAD_PROGRESS_TRACKER_H_ +#define CONTENT_RENDERER_LOAD_PROGRESS_TRACKER_H_ #include "base/logging.h" #include "base/task.h" @@ -42,5 +42,4 @@ class LoadProgressTracker { DISALLOW_COPY_AND_ASSIGN(LoadProgressTracker); }; -#endif // CHROME_RENDERER_LOAD_PROGRESS_TRACKER_H_ - +#endif // CONTENT_RENDERER_LOAD_PROGRESS_TRACKER_H_ diff --git a/chrome/renderer/navigation_state.cc b/content/renderer/navigation_state.cc index 57be7eb..78bebbb 100644 --- a/chrome/renderer/navigation_state.cc +++ b/content/renderer/navigation_state.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/renderer/navigation_state.h" +#include "content/renderer/navigation_state.h" #include "chrome/renderer/user_script_idle_scheduler.h" #include "webkit/glue/alt_error_page_resource_fetcher.h" diff --git a/chrome/renderer/navigation_state.h b/content/renderer/navigation_state.h index 8941542..8941542 100644 --- a/chrome/renderer/navigation_state.h +++ b/content/renderer/navigation_state.h diff --git a/chrome/renderer/paint_aggregator.cc b/content/renderer/paint_aggregator.cc index e5f894c..927630b 100644 --- a/chrome/renderer/paint_aggregator.cc +++ b/content/renderer/paint_aggregator.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/renderer/paint_aggregator.h" +#include "content/renderer/paint_aggregator.h" #include "base/logging.h" #include "base/metrics/histogram.h" diff --git a/chrome/renderer/paint_aggregator.h b/content/renderer/paint_aggregator.h index 2ceef57..84d36907 100644 --- a/chrome/renderer/paint_aggregator.h +++ b/content/renderer/paint_aggregator.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_RENDERER_PAINT_AGGREGATOR_H_ -#define CHROME_RENDERER_PAINT_AGGREGATOR_H_ +#ifndef CONTENT_RENDERER_PAINT_AGGREGATOR_H_ +#define CONTENT_RENDERER_PAINT_AGGREGATOR_H_ #pragma once #include <vector> @@ -61,4 +61,4 @@ class PaintAggregator { PendingUpdate update_; }; -#endif // CHROME_RENDERER_PAINT_AGGREGATOR_H_ +#endif // CONTENT_RENDERER_PAINT_AGGREGATOR_H_ diff --git a/chrome/renderer/paint_aggregator_unittest.cc b/content/renderer/paint_aggregator_unittest.cc index 03f605f..1874270 100644 --- a/chrome/renderer/paint_aggregator_unittest.cc +++ b/content/renderer/paint_aggregator_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/renderer/paint_aggregator.h" +#include "content/renderer/paint_aggregator.h" #include "testing/gtest/include/gtest/gtest.h" TEST(PaintAggregator, InitialState) { diff --git a/chrome/renderer/pepper_platform_context_3d_impl.cc b/content/renderer/pepper_platform_context_3d_impl.cc index 19d3e28..a7c396f 100644 --- a/chrome/renderer/pepper_platform_context_3d_impl.cc +++ b/content/renderer/pepper_platform_context_3d_impl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/renderer/pepper_platform_context_3d_impl.h" +#include "content/renderer/pepper_platform_context_3d_impl.h" #include "chrome/renderer/render_thread.h" #include "content/renderer/command_buffer_proxy.h" diff --git a/chrome/renderer/pepper_platform_context_3d_impl.h b/content/renderer/pepper_platform_context_3d_impl.h index 0a817bc..4e8b7bf 100644 --- a/chrome/renderer/pepper_platform_context_3d_impl.h +++ b/content/renderer/pepper_platform_context_3d_impl.h @@ -1,8 +1,8 @@ // Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_RENDERER_PEPPER_PLATFORM_CONTEXT_3D_IMPL_H_ -#define CHROME_RENDERER_PEPPER_PLATFORM_CONTEXT_3D_IMPL_H_ +#ifndef CONTENT_RENDERER_PEPPER_PLATFORM_CONTEXT_3D_IMPL_H_ +#define CONTENT_RENDERER_PEPPER_PLATFORM_CONTEXT_3D_IMPL_H_ #include "base/callback.h" #include "base/scoped_callback_factory.h" @@ -53,4 +53,4 @@ class PlatformContext3DImpl #endif // ENABLE_GPU -#endif // CHROME_RENDERER_PEPPER_PLATFORM_CONTEXT_3D_IMPL_H_ +#endif // CONTENT_RENDERER_PEPPER_PLATFORM_CONTEXT_3D_IMPL_H_ diff --git a/chrome/renderer/pepper_plugin_delegate_impl.cc b/content/renderer/pepper_plugin_delegate_impl.cc index 6b41bfd..777de0b 100644 --- a/chrome/renderer/pepper_plugin_delegate_impl.cc +++ b/content/renderer/pepper_plugin_delegate_impl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/renderer/pepper_plugin_delegate_impl.h" +#include "content/renderer/pepper_plugin_delegate_impl.h" #include <cmath> #include <queue> @@ -18,7 +18,6 @@ #include "chrome/common/pepper_plugin_registry.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" -#include "chrome/renderer/pepper_platform_context_3d_impl.h" #include "chrome/renderer/render_thread.h" #include "chrome/renderer/render_view.h" #include "content/common/child_process_messages.h" @@ -28,11 +27,12 @@ #include "content/common/pepper_messages.h" #include "content/renderer/audio_message_filter.h" #include "content/renderer/command_buffer_proxy.h" +#include "content/renderer/content_renderer_client.h" #include "content/renderer/ggl.h" #include "content/renderer/gpu_channel_host.h" +#include "content/renderer/pepper_platform_context_3d_impl.h" #include "content/renderer/webgraphicscontext3d_command_buffer_impl.h" #include "content/renderer/webplugin_delegate_proxy.h" -#include "grit/locale_settings.h" #include "ipc/ipc_channel_handle.h" #include "ppapi/c/dev/pp_video_dev.h" #include "ppapi/c/pp_errors.h" @@ -44,7 +44,6 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/gfx/size.h" #include "webkit/fileapi/file_system_callback_dispatcher.h" #include "webkit/glue/context_menu.h" @@ -918,7 +917,7 @@ gfx::Size PepperPluginDelegateImpl::GetScreenSize() { std::string PepperPluginDelegateImpl::GetDefaultEncoding() { // TODO(brettw) bug 56615: Somehow get the preference for the default // encoding here rather than using the global default for the UI language. - return l10n_util::GetStringUTF8(IDS_DEFAULT_ENCODING); + return content::GetContentClient()->renderer()->GetDefaultEncoding(); } void PepperPluginDelegateImpl::ZoomLimitsChanged(double minimum_factor, diff --git a/chrome/renderer/pepper_plugin_delegate_impl.h b/content/renderer/pepper_plugin_delegate_impl.h index 0502b2f..5def533 100644 --- a/chrome/renderer/pepper_plugin_delegate_impl.h +++ b/content/renderer/pepper_plugin_delegate_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_RENDERER_PEPPER_PLUGIN_DELEGATE_IMPL_H_ -#define CHROME_RENDERER_PEPPER_PLUGIN_DELEGATE_IMPL_H_ +#ifndef CONTENT_RENDERER_PEPPER_PLUGIN_DELEGATE_IMPL_H_ +#define CONTENT_RENDERER_PEPPER_PLUGIN_DELEGATE_IMPL_H_ #pragma once #include <set> @@ -199,4 +199,4 @@ class PepperPluginDelegateImpl DISALLOW_COPY_AND_ASSIGN(PepperPluginDelegateImpl); }; -#endif // CHROME_RENDERER_PEPPER_PLUGIN_DELEGATE_IMPL_H_ +#endif // CONTENT_RENDERER_PEPPER_PLUGIN_DELEGATE_IMPL_H_ diff --git a/chrome/renderer/web_ui_bindings.cc b/content/renderer/web_ui_bindings.cc index c84a54d..4d555da 100644 --- a/chrome/renderer/web_ui_bindings.cc +++ b/content/renderer/web_ui_bindings.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/renderer/web_ui_bindings.h" +#include "content/renderer/web_ui_bindings.h" #include "base/json/json_writer.h" #include "base/scoped_ptr.h" diff --git a/chrome/renderer/web_ui_bindings.h b/content/renderer/web_ui_bindings.h index 10965ff..0d49c96 100644 --- a/chrome/renderer/web_ui_bindings.h +++ b/content/renderer/web_ui_bindings.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_RENDERER_WEB_UI_BINDINGS_H_ -#define CHROME_RENDERER_WEB_UI_BINDINGS_H_ +#ifndef CONTENT_RENDERER_WEB_UI_BINDINGS_H_ +#define CONTENT_RENDERER_WEB_UI_BINDINGS_H_ #pragma once #include "ipc/ipc_message.h" @@ -65,4 +65,4 @@ class WebUIBindings : public DOMBoundBrowserObject { DISALLOW_COPY_AND_ASSIGN(WebUIBindings); }; -#endif // CHROME_RENDERER_WEB_UI_BINDINGS_H_ +#endif // CONTENT_RENDERER_WEB_UI_BINDINGS_H_ |