diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 17:15:33 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:47:18 +0000 |
| commit | 7324afb043a0b1e623d8e8eb906cdc53bdeb4685 (patch) | |
| tree | a3fe2d74ea9c9e142c390dac4ca0e219382ace46 /chromium/components/error_page | |
| parent | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (diff) | |
| download | qtwebengine-chromium-7324afb043a0b1e623d8e8eb906cdc53bdeb4685.tar.gz | |
BASELINE: Update Chromium to 58.0.3029.54
Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/components/error_page')
| -rw-r--r-- | chromium/components/error_page/renderer/DEPS | 2 | ||||
| -rw-r--r-- | chromium/components/error_page/renderer/net_error_helper_core.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chromium/components/error_page/renderer/DEPS b/chromium/components/error_page/renderer/DEPS index 3238bc4a131..a9b7cae6eb3 100644 --- a/chromium/components/error_page/renderer/DEPS +++ b/chromium/components/error_page/renderer/DEPS @@ -1,7 +1,7 @@ include_rules = [ + "+components/strings/grit/components_strings.h", "+components/url_formatter", "+content/public/common", - "+grit/components_strings.h", "+net", "+third_party/WebKit/public/platform", "+ui/base", diff --git a/chromium/components/error_page/renderer/net_error_helper_core.cc b/chromium/components/error_page/renderer/net_error_helper_core.cc index f040f97f3d8..e9c1eef43d7 100644 --- a/chromium/components/error_page/renderer/net_error_helper_core.cc +++ b/chromium/components/error_page/renderer/net_error_helper_core.cc @@ -28,9 +28,9 @@ #include "base/values.h" #include "build/build_config.h" #include "components/error_page/common/error_page_params.h" +#include "components/strings/grit/components_strings.h" #include "components/url_formatter/url_formatter.h" #include "content/public/common/url_constants.h" -#include "grit/components_strings.h" #include "net/base/escape.h" #include "net/base/net_errors.h" #include "third_party/WebKit/public/platform/WebString.h" |