Merge MediaControlsChromium into MediaControls (2nd try)
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.
The 1st try broke Android: https://codereview.chromium.org/144083003/
The problem was that MediaControlsChromiumAndroid::createControls()
was merged into the Android MediaControls::create(), but obviously
that doesn't have access to the private members it needs.
Simplify things by having only a single implementation of create() and
make initializeControls() virtual instead. The ifdefery is thus
reduced to a single line in MediaControls::create().
BUG=341813
Review URL: https://codereview.chromium.org/158333002
git-svn-id: svn://svn.chromium.org/blink/trunk@166893 bbb929c8-8fbe-4397-9dbb-9b2b20218538
7 files changed