diff options
| author | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 21:24:17 +0000 |
|---|---|---|
| committer | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 21:24:17 +0000 |
| commit | 5f745718ff8052fb22fd411cd9202d04d9afdb06 (patch) | |
| tree | 4bfb07e624d42c49c4ee0fb88035c238e2072153 /components/autofill/browser/autofill_manager.cc | |
| parent | d77626b8b7e0e19e73363df0bc8f9f2e104bd767 (diff) | |
| download | chromium_src-5f745718ff8052fb22fd411cd9202d04d9afdb06.zip chromium_src-5f745718ff8052fb22fd411cd9202d04d9afdb06.tar.gz chromium_src-5f745718ff8052fb22fd411cd9202d04d9afdb06.tar.bz2 | |
Revert 199800 "Separate component resources into their own .grd ..."
Broke the mac build on the chromium.perf waterfall, see:
http://build.chromium.org/p/chromium.perf/builders/Mac%20Builder/builds/47157/steps/compile/logs/stdio
> Separate component resources into their own .grd file
>
> TBR=ben@chromium.org (gyp changes)
> BUG=140037
>
> Review URL: https://chromiumcodereview.appspot.com/15018020
TBR=caitkp@chromium.org
Review URL: https://codereview.chromium.org/14875011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199825 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/autofill/browser/autofill_manager.cc')
| -rw-r--r-- | components/autofill/browser/autofill_manager.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/autofill/browser/autofill_manager.cc b/components/autofill/browser/autofill_manager.cc index b488ff6..ff16c6b 100644 --- a/components/autofill/browser/autofill_manager.cc +++ b/components/autofill/browser/autofill_manager.cc @@ -51,7 +51,7 @@ #include "content/public/browser/web_contents_view.h" #include "content/public/common/url_constants.h" #include "googleurl/src/gurl.h" -#include "grit/component_resources.h" +#include "grit/generated_resources.h" #include "ipc/ipc_message_macros.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h" #include "ui/base/l10n/l10n_util.h" |