diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 17:22:36 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 17:22:36 +0000 |
| commit | 47822260423f1b6195260dc06ce1a96e5daf291c (patch) | |
| tree | bb5c187edda4695d2d586074a00b22bf003797ea /content/DEPS | |
| parent | fad1a9fad3803f2c1e33b6df4b23383f012ee682 (diff) | |
| download | chromium_src-47822260423f1b6195260dc06ce1a96e5daf291c.zip chromium_src-47822260423f1b6195260dc06ce1a96e5daf291c.tar.gz chromium_src-47822260423f1b6195260dc06ce1a96e5daf291c.tar.bz2 | |
Reland r195688 which was reverted due to build break.
There are two changes from the original CL:
1. In RenderWidgetHostViewAura::OnWindowFocused, update touch_editing_client_
before host->Shutdown.
2. Patched in r195696 to fix win_aura build
BUG=115237
TBR=jam@chromium.org,tsepez@chromium.org
Review URL: https://chromiumcodereview.appspot.com/13999010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195823 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/DEPS')
| -rw-r--r-- | content/DEPS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/content/DEPS b/content/DEPS index 79b961e..71d3a15 100644 --- a/content/DEPS +++ b/content/DEPS @@ -20,6 +20,7 @@ include_rules = [ "+crypto", "+grit/content_resources.h", "+grit/ui_resources.h", + "+grit/ui_strings.h", "+grit/webkit_chromium_resources.h", "+grit/webkit_resources.h", "+grit/webkit_strings.h", |