diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-25 15:48:16 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-25 15:48:16 +0000 |
| commit | 5c586489b82900dfd5a12a158d5a23634defe54a (patch) | |
| tree | 0b0aaf50ca061063d3f4b40f3a03d0f6537621fb /webkit/common | |
| parent | 08be10fd1984246b651d41ce759a5e189ecea439 (diff) | |
| download | chromium_src-5c586489b82900dfd5a12a158d5a23634defe54a.zip chromium_src-5c586489b82900dfd5a12a158d5a23634defe54a.tar.gz chromium_src-5c586489b82900dfd5a12a158d5a23634defe54a.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/common')
| -rw-r--r-- | webkit/common/cursors/webcursor_mac.mm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/webkit/common/cursors/webcursor_mac.mm b/webkit/common/cursors/webcursor_mac.mm index 0abc3e9..fc425ed 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/webkit_chromium_resources.h" +#include "grit/blink_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,7 +17,6 @@ #include "ui/gfx/point_conversions.h" #include "ui/gfx/size_conversions.h" - using WebKit::WebCursorInfo; using WebKit::WebSize; |