diff options
| author | jamescook <jamescook@chromium.org> | 2014-08-25 17:29:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-26 00:32:40 +0000 |
| commit | 196564d93b1ed77487eb570b2ab74e7adc3af8ef (patch) | |
| tree | 0f16f845671fcc4549108c7e61ddc3dee41ad9a8 /chrome/browser/plugins | |
| parent | eea980418ca9c235cdd6a93dd601035616f45616 (diff) | |
| download | chromium_src-196564d93b1ed77487eb570b2ab74e7adc3af8ef.zip chromium_src-196564d93b1ed77487eb570b2ab74e7adc3af8ef.tar.gz chromium_src-196564d93b1ed77487eb570b2ab74e7adc3af8ef.tar.bz2 | |
Revert "Move core web_view code to extensions." (patchset #6 of https://codereview.chromium.org/496873006/)
This reverts commit 63bf863b12e8c2be593da2318af8ab7c7fbcc8a4.
This breaks the app_shell build for the reasons jamesr describes (src/extensions now depends on generated headers from src/chrome, but there cannot be a dependency from extensions -> chrome).
Hypothetical repro on Linux:
* rm -rf out/* && gclient runhooks && ninja -C out/Debug -j 1000 app_shell
chrome/browser/extensions/api/capture_web_contents_function.h:9:10: fatal error: 'chrome/common/extensions/api/types.h' file not found
Original issue's description:
> Move core web_view code to extensions.
>
>
> BUG=352290
>
> Committed: https://chromium.googlesource.com/chromium/src/+/1218a23163baab9f53d70e9a63030db13ef04d04
TBR=fsamuel@chromium.org,yoz@chromium.org,kalman@chromium.org,sky@chromium.org,dmazzoni@chromium.org,jamesr@chromium.org,hanxi@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=352290
Review URL: https://codereview.chromium.org/502273002
Cr-Commit-Position: refs/heads/master@{#291808}
Diffstat (limited to 'chrome/browser/plugins')
| -rw-r--r-- | chrome/browser/plugins/plugin_info_message_filter.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/plugins/plugin_info_message_filter.cc b/chrome/browser/plugins/plugin_info_message_filter.cc index e6f9415..f1d721c 100644 --- a/chrome/browser/plugins/plugin_info_message_filter.cc +++ b/chrome/browser/plugins/plugin_info_message_filter.cc @@ -27,7 +27,7 @@ #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. #if defined(ENABLE_EXTENSIONS) -#include "extensions/browser/guest_view/web_view/web_view_renderer_state.h" +#include "chrome/browser/guest_view/web_view/web_view_renderer_state.h" #endif #if defined(OS_WIN) |