| commit | 313234443126995ebd2c9d10811952adf7381dde | [log] [tgz] |
|---|---|---|
| author | philipj@opera.com <philipj@opera.com@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | Sat Feb 08 02:48:13 2014 |
| committer | philipj@opera.com <philipj@opera.com@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | Sat Feb 08 02:48:13 2014 |
| tree | f346affcad2da9b18d5609178e11d17621ab69fe | |
| parent | bc626ad2d535c665f3d48443e7b7dc9ef2e14fd5 [diff] |
Merge MediaControlsChromium into MediaControls To the largest extent possible, code was copied from MediaControlsChromium.* to MediaControls.* without modification. Where MediaControlsChromium virtual functions called the MediaControls base functions, the order was preserved to avoid changing behavior. BUG=341813 Review URL: https://codereview.chromium.org/157403002 git-svn-id: svn://svn.chromium.org/blink/trunk@166753 bbb929c8-8fbe-4397-9dbb-9b2b20218538