diff options
| author | mlamouri <mlamouri@chromium.org> | 2014-09-10 08:14:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-10 15:30:29 +0000 |
| commit | 862a2ed21519f80c0115ed4998d9edd559666922 (patch) | |
| tree | f50a914b8d8ab71fb94903d8d56194d7cb8afe0a /chrome/renderer | |
| parent | 91af9a880b03c43c0a3b5d1da88b0bcb03603752 (diff) | |
| download | chromium_src-862a2ed21519f80c0115ed4998d9edd559666922.zip chromium_src-862a2ed21519f80c0115ed4998d9edd559666922.tar.gz chromium_src-862a2ed21519f80c0115ed4998d9edd559666922.tar.bz2 | |
Return WebLocalFrame from RenderFrame::GetWebFrame().
BUG=409995
Review URL: https://codereview.chromium.org/547093002
Cr-Commit-Position: refs/heads/master@{#294173}
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/content_settings_observer.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/extensions/extension_frame_helper.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/net/net_error_helper.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/net/net_error_page_controller.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/prefetch_helper.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc index 8c9d8c6..7c282fb 100644 --- a/chrome/renderer/content_settings_observer.cc +++ b/chrome/renderer/content_settings_observer.cc @@ -17,8 +17,8 @@ #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/web/WebDataSource.h" #include "third_party/WebKit/public/web/WebDocument.h" -#include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebFrameClient.h" +#include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/WebKit/public/web/WebSecurityOrigin.h" #include "third_party/WebKit/public/web/WebView.h" diff --git a/chrome/renderer/extensions/extension_frame_helper.cc b/chrome/renderer/extensions/extension_frame_helper.cc index c88c4cd..7ee0e21 100644 --- a/chrome/renderer/extensions/extension_frame_helper.cc +++ b/chrome/renderer/extensions/extension_frame_helper.cc @@ -9,7 +9,7 @@ #include "extensions/renderer/console.h" #include "extensions/renderer/dispatcher.h" #include "third_party/WebKit/public/web/WebConsoleMessage.h" -#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebLocalFrame.h" namespace extensions { diff --git a/chrome/renderer/net/net_error_helper.cc b/chrome/renderer/net/net_error_helper.cc index b1854d0..0e75c06 100644 --- a/chrome/renderer/net/net_error_helper.cc +++ b/chrome/renderer/net/net_error_helper.cc @@ -34,7 +34,7 @@ #include "third_party/WebKit/public/platform/WebURLResponse.h" #include "third_party/WebKit/public/web/WebDataSource.h" #include "third_party/WebKit/public/web/WebDocument.h" -#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/WebKit/public/web/WebView.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/webui/jstemplate_builder.h" diff --git a/chrome/renderer/net/net_error_page_controller.cc b/chrome/renderer/net/net_error_page_controller.cc index fcdbfab..8a16a55 100644 --- a/chrome/renderer/net/net_error_page_controller.cc +++ b/chrome/renderer/net/net_error_page_controller.cc @@ -9,8 +9,8 @@ #include "content/public/renderer/render_frame.h" #include "gin/handle.h" #include "gin/object_template_builder.h" -#include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebLocalFrame.h" gin::WrapperInfo NetErrorPageController::kWrapperInfo = { gin::kEmbedderNativeGin}; diff --git a/chrome/renderer/prefetch_helper.cc b/chrome/renderer/prefetch_helper.cc index 4801e16..b64eb19 100644 --- a/chrome/renderer/prefetch_helper.cc +++ b/chrome/renderer/prefetch_helper.cc @@ -6,7 +6,7 @@ #include "chrome/common/prefetch_messages.h" #include "content/public/renderer/render_frame.h" -#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/WebKit/public/web/WebURLLoaderOptions.h" namespace prefetch { |