diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-20 19:42:29 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-20 19:45:01 +0000 |
| commit | ae8d08981d92f052f174c3f0e1615c17e9b5c7d4 (patch) | |
| tree | 6d80a69efc58517ae20667cafc05bb384b0cf6c2 /extensions | |
| parent | b1cba40763350fb40c3d79a2f80aa929377d6fb9 (diff) | |
| download | chromium_src-ae8d08981d92f052f174c3f0e1615c17e9b5c7d4.zip chromium_src-ae8d08981d92f052f174c3f0e1615c17e9b5c7d4.tar.gz chromium_src-ae8d08981d92f052f174c3f0e1615c17e9b5c7d4.tar.bz2 | |
Use a qualified path for grit/content_resources.h.
The source file changes were done using:
for f in $(git grep -l '"grit/content_resources.h"' -- '*.cc' '*.mm'); do
sed -i -e 's/"grit\/content_resources.h"/"content\/grit\/content_resources.h"/' $f ;
done
tools/git/for-all-touched-files.py -c "tools/sort-headers.py -f [[FILENAME]]"
The gyp, gn, and DEPS changes were lovingly hand-crafted.
BUG=401588
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/492813002
Cr-Commit-Position: refs/heads/master@{#290896}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/DEPS | 2 | ||||
| -rw-r--r-- | extensions/renderer/dispatcher.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/DEPS b/extensions/DEPS index 98f9058..67c2fd1 100644 --- a/extensions/DEPS +++ b/extensions/DEPS @@ -3,10 +3,10 @@ include_rules = [ "+components/crx_file", "+components/url_matcher", "-content", + "+content/grit/content_resources.h", "+content/public/common", "+content/public/test", "+crypto", - "+grit/content_resources.h", "+grit/extensions_renderer_resources.h", "+grit/extensions_resources.h", "+mojo/public", diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc index ef133398..c238ad7 100644 --- a/extensions/renderer/dispatcher.cc +++ b/extensions/renderer/dispatcher.cc @@ -14,6 +14,7 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/values.h" +#include "content/grit/content_resources.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" #include "content/public/renderer/render_thread.h" @@ -75,7 +76,6 @@ #include "extensions/renderer/user_gestures_native_handler.h" #include "extensions/renderer/utils_native_handler.h" #include "extensions/renderer/v8_context_native_handler.h" -#include "grit/content_resources.h" #include "grit/extensions_renderer_resources.h" #include "mojo/public/js/bindings/constants.h" #include "third_party/WebKit/public/platform/WebString.h" |