← Back to branch summary

~osomon/oxide/override-touchUngrabEvent

« back to all changes in this revision

Viewing changes to shared/browser/media/oxide_video_capture_device_hybris.cc

  • Committer: Chris Coulson
  • Date: 2016-01-08 21:31:20 UTC
  • Revision ID: chris.coulson@canonical.com-20160108213120-9v54434yvfmsd7lz
Be a bit more intelligent when detecting whether the hybris camera compatibility layer is available, or whether we're running on the Android EGL stack

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/browser/media/oxide_video_capture_device_hybris.cc
31
31
#include "ui/gl/gl_implementation.h"
32
32
#include "ui/gl/gl_surface.h"
33
33
 
34
 
#include "shared/browser/oxide_android_properties.h"
35
34
#include "shared/browser/oxide_browser_platform_integration.h"
 
35
#include "shared/browser/oxide_hybris_utils.h"
36
36
 
37
37
namespace oxide {
38
38
 
187
187
      position_(BACK_FACING_CAMERA_TYPE),
188
188
      orientation_(0),
189
189
      camera_control_(nullptr) {
190
 
  DCHECK(AndroidProperties::GetInstance()->Available());
 
190
  DCHECK(HybrisUtils::IsCameraCompatAvailable());
191
191
}
192
192
 
193
193
VideoCaptureDeviceHybris::~VideoCaptureDeviceHybris() {