summaryrefslogtreecommitdiffstats
path: root/webkit/common
diff options
context:
space:
mode:
authorbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-25 16:10:04 +0000
committerbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-25 16:10:04 +0000
commit55dedd6828a7e13c63f9c29e579f4b4174ed4743 (patch)
tree39031f60ffc13b70fd9098f7480ddcdec7d170e2 /webkit/common
parentf24201908b538ac7f365399d90b060a8801d0aa9 (diff)
downloadchromium_src-55dedd6828a7e13c63f9c29e579f4b4174ed4743.zip
chromium_src-55dedd6828a7e13c63f9c29e579f4b4174ed4743.tar.gz
chromium_src-55dedd6828a7e13c63f9c29e579f4b4174ed4743.tar.bz2
Revert 213636 "Switch Chromium to use Blink's blink_resources.grd"
Broke the build with: error: 'gen/webkit/webkit_chromium_resources.pak', needed by 'DumpRenderTree.pak', missing and no known rule to make it > Switch Chromium to use Blink's blink_resources.grd > > WebKit.grd is deprecated, so we update it public/blink_resources.grd. > > R=darin@chromium.org, joth@chromium.org, thestig@chromium.org > > Review URL: https://codereview.chromium.org/19537010 TBR=tfarina@chromium.org Review URL: https://codereview.chromium.org/20341002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213640 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/common')
-rw-r--r--webkit/common/cursors/webcursor_mac.mm3
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/common/cursors/webcursor_mac.mm b/webkit/common/cursors/webcursor_mac.mm
index fc425ed..0abc3e9 100644
--- a/webkit/common/cursors/webcursor_mac.mm
+++ b/webkit/common/cursors/webcursor_mac.mm
@@ -9,7 +9,7 @@
#include "base/logging.h"
#include "base/mac/mac_util.h"
#include "base/mac/scoped_cftyperef.h"
-#include "grit/blink_resources.h"
+#include "grit/webkit_chromium_resources.h"
#include "skia/ext/skia_utils_mac.h"
#include "third_party/WebKit/public/platform/WebSize.h"
#include "third_party/WebKit/public/web/WebCursorInfo.h"
@@ -17,6 +17,7 @@
#include "ui/gfx/point_conversions.h"
#include "ui/gfx/size_conversions.h"
+
using WebKit::WebCursorInfo;
using WebKit::WebSize;