From b17e63d13c29f15326edc91f55be10356e9441a2 Mon Sep 17 00:00:00 2001 From: Adam Roben Date: Tue, 2 Jul 2013 10:07:23 -0400 Subject: [PATCH] Update libchromiumcontent to be based on Chrome 28 * vendor/libchromiumcontent f4f8a7e...929f9c9 (3): > Merge pull request #19 from brightray/chrome-28 > Merge pull request #18 from brightray/encryptor > Merge pull request #17 from brightray/cygwin --- brightray/common/content_client.cc | 2 +- brightray/vendor/libchromiumcontent | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/brightray/common/content_client.cc b/brightray/common/content_client.cc index fc294f45ec5..87cc07abfee 100644 --- a/brightray/common/content_client.cc +++ b/brightray/common/content_client.cc @@ -9,7 +9,7 @@ #include "base/stringprintf.h" #include "base/string_util.h" #include "ui/base/resource/resource_bundle.h" -#include "webkit/common/user_agent/user_agent_util.h" +#include "webkit/user_agent/user_agent_util.h" namespace brightray { diff --git a/brightray/vendor/libchromiumcontent b/brightray/vendor/libchromiumcontent index f4f8a7ecad6..929f9c9b38c 160000 --- a/brightray/vendor/libchromiumcontent +++ b/brightray/vendor/libchromiumcontent @@ -1 +1 @@ -Subproject commit f4f8a7ecad6df079c54ca87cb4a3a0f4d6cf9771 +Subproject commit 929f9c9b38cb4f2069944873f4babe3b1bfaad0f