| Index: chrome/browser/chromeos/login/camera.cc
|
| diff --git a/chrome/browser/chromeos/login/camera.cc b/chrome/browser/chromeos/login/camera.cc
|
| index 6c2bf45c0d6529e9242281594d02ea8de9a5139a..41dbbb6bc24acc13e9a95304d9e3cdf9fa179670 100644
|
| --- a/chrome/browser/chromeos/login/camera.cc
|
| +++ b/chrome/browser/chromeos/login/camera.cc
|
| @@ -4,17 +4,17 @@
|
|
|
| #include "chrome/browser/chromeos/login/camera.h"
|
|
|
| -#include <stdlib.h>
|
| -#include <fcntl.h> // low-level i/o
|
| -#include <unistd.h>
|
| +#include <asm/types.h> // for videodev2.h
|
| #include <errno.h>
|
| +#include <fcntl.h> // low-level i/o
|
| +#include <linux/videodev2.h>
|
| +#include <stdlib.h>
|
| +#include <sys/ioctl.h>
|
| +#include <sys/mman.h>
|
| #include <sys/stat.h>
|
| -#include <sys/types.h>
|
| #include <sys/time.h>
|
| -#include <sys/mman.h>
|
| -#include <sys/ioctl.h>
|
| -#include <asm/types.h> // for videodev2.h
|
| -#include <linux/videodev2.h>
|
| +#include <sys/types.h>
|
| +#include <unistd.h>
|
|
|
| #include <algorithm>
|
| #include <vector>
|
| @@ -26,7 +26,7 @@
|
| #include "base/stringprintf.h"
|
| #include "base/threading/thread.h"
|
| #include "base/time.h"
|
| -#include "content/browser/browser_thread.h"
|
| +#include "content/public/browser/browser_thread.h"
|
| #include "skia/ext/image_operations.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
| #include "third_party/skia/include/core/SkColorPriv.h"
|
|
|