diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:20:33 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:28:57 +0000 |
commit | d17ea114e5ef69ad5d5d7413280a13e6428098aa (patch) | |
tree | 2c01a75df69f30d27b1432467cfe7c1467a498da /chromium/content/browser/hyphenation | |
parent | 8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (diff) | |
download | qtwebengine-chromium-d17ea114e5ef69ad5d5d7413280a13e6428098aa.tar.gz |
BASELINE: Update Chromium to 67.0.3396.47
Change-Id: Idcb1341782e417561a2473eeecc82642dafda5b7
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/content/browser/hyphenation')
-rw-r--r-- | chromium/content/browser/hyphenation/DEPS | 2 | ||||
-rw-r--r-- | chromium/content/browser/hyphenation/hyphenation_impl.cc | 1 | ||||
-rw-r--r-- | chromium/content/browser/hyphenation/hyphenation_impl.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/chromium/content/browser/hyphenation/DEPS b/chromium/content/browser/hyphenation/DEPS index 1f557f4a15b..9b7ca8ca456 100644 --- a/chromium/content/browser/hyphenation/DEPS +++ b/chromium/content/browser/hyphenation/DEPS @@ -1,5 +1,5 @@ include_rules = [ "-content", "+content/browser/hyphenation", - "+third_party/WebKit/public/platform/modules/hyphenation/hyphenation.mojom.h", + "+third_party/blink/public/platform/modules/hyphenation/hyphenation.mojom.h", ] diff --git a/chromium/content/browser/hyphenation/hyphenation_impl.cc b/chromium/content/browser/hyphenation/hyphenation_impl.cc index a943bf4297a..ab21104f132 100644 --- a/chromium/content/browser/hyphenation/hyphenation_impl.cc +++ b/chromium/content/browser/hyphenation/hyphenation_impl.cc @@ -10,7 +10,6 @@ #include "base/files/file.h" #include "base/files/file_path.h" -#include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" diff --git a/chromium/content/browser/hyphenation/hyphenation_impl.h b/chromium/content/browser/hyphenation/hyphenation_impl.h index 878f0c24dda..05014dd9f85 100644 --- a/chromium/content/browser/hyphenation/hyphenation_impl.h +++ b/chromium/content/browser/hyphenation/hyphenation_impl.h @@ -7,7 +7,7 @@ #include "base/macros.h" #include "mojo/public/cpp/bindings/interface_request.h" -#include "third_party/WebKit/public/platform/modules/hyphenation/hyphenation.mojom.h" +#include "third_party/blink/public/platform/modules/hyphenation/hyphenation.mojom.h" namespace hyphenation { |