diff options
| author | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-15 20:22:58 +0000 |
|---|---|---|
| committer | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-15 20:22:58 +0000 |
| commit | 43f2648cd1c4115602ef9617b058d7ba02aa2f2d (patch) | |
| tree | 6a19b7a2142ac572e6e4c471882758c297763220 | |
| parent | 3e02b2963f37a09e15c59a36d9fcf584f9e9bc6c (diff) | |
| download | chromium_src-43f2648cd1c4115602ef9617b058d7ba02aa2f2d.zip chromium_src-43f2648cd1c4115602ef9617b058d7ba02aa2f2d.tar.gz chromium_src-43f2648cd1c4115602ef9617b058d7ba02aa2f2d.tar.bz2 | |
Merge 217649 "Add Hangouts IDs to webview experimental exceptions"
> Add Hangouts IDs to webview experimental exceptions
>
> BUG=273030
>
> Review URL: https://chromiumcodereview.appspot.com/23123006
TBR=rockot@chromium.org
Review URL: https://codereview.chromium.org/22810006
git-svn-id: svn://svn.chromium.org/chrome/branches/1547/src@217833 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/renderer/extensions/dispatcher.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc index c271759..69d99a7 100644 --- a/chrome/renderer/extensions/dispatcher.cc +++ b/chrome/renderer/extensions/dispatcher.cc @@ -1142,7 +1142,9 @@ void Dispatcher::DidCreateScriptContext( std::string hexencoded_id_hash = base::HexEncode(id_hash.c_str(), id_hash.length()); if (hexencoded_id_hash == "8C3741E3AF0B93B6E8E0DDD499BB0B74839EA578" || - hexencoded_id_hash == "E703483CEF33DEC18B4B6DD84B5C776FB9182BDB") + hexencoded_id_hash == "E703483CEF33DEC18B4B6DD84B5C776FB9182BDB" || + hexencoded_id_hash == "1A26E32DE447A17CBE5E9750CDBA78F58539B39C" || + hexencoded_id_hash == "59048028102D7B4C681DBC7BC6CD980C3DC66DA3") includeExperimental = true; } if (includeExperimental) |