diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-19 00:02:16 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-19 00:02:16 +0200 |
| commit | 2ba0e25a0c6fee7e2144f1fc8b577f73e1155e6d (patch) | |
| tree | 504e526cbb840733a316714c890fb25d1d64eb1c /src/core/chromium_overrides.cpp | |
| parent | 2c246e60e886b082e7438cf8f68cdc22bc919fd9 (diff) | |
| parent | f5ec28285ab7f71d6d75af963ae499603da6630e (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I78c25caf30923fc1101b137f9abc3993e3cf0600
Diffstat (limited to 'src/core/chromium_overrides.cpp')
| -rw-r--r-- | src/core/chromium_overrides.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp index 3e2008bbf..9340923df 100644 --- a/src/core/chromium_overrides.cpp +++ b/src/core/chromium_overrides.cpp @@ -50,10 +50,6 @@ #include <QFontDatabase> #include <QStringList> -#if defined(OS_ANDROID) -#include "media/video/capture/fake_video_capture_device.h" -#endif - #if defined(USE_X11) #include "ui/gfx/x/x11_types.h" #endif @@ -193,20 +189,3 @@ PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string&, int) } // namespace gfx #endif // defined(USE_AURA) && !defined(USE_OZONE) - -#if defined(OS_ANDROID) -namespace ui { -bool GrabViewSnapshot(gfx::NativeView /*view*/, std::vector<unsigned char>* /*png_representation*/, const gfx::Rect& /*snapshot_bounds*/) -{ - NOTIMPLEMENTED(); - return false; -} -} - -namespace media { -const std::string FakeVideoCaptureDevice::Name::GetModel() const -{ - return ""; -} -} -#endif |