| commit | 4cb289145e717dc3db6fe8073b9eab3d52a3b457 | [log] [tgz] |
|---|---|---|
| author | mthiesse <[email protected]> | Tue Apr 25 23:57:33 2017 |
| committer | Commit bot <[email protected]> | Tue Apr 25 23:57:33 2017 |
| tree | 8b86db343baaba19a4e3dbc92cf7637ec02b45cb | |
| parent | faaae321d190728d93ff5b51c961c3d28c016ae5 [diff] [blame] |
Move vr features.gni into its own directory. This fixes some weird issues we were encountering, where we had to hide some build targets behind (!is_ios) after adding our features target to ui/gfx. I'm not sure if any extra code was being compiled in, but asserts in gn files were being hit related to things that shouldn't be included on ios. It seems other features have already done this sort of thing. [email protected] BUG= Review-Url: https://codereview.chromium.org/2840563004 Cr-Commit-Position: refs/heads/master@{#467113} Committed: https://chromium.googlesource.com/chromium/src/+/faae24707ba8852ea92b56bcf77aa19878aacdab CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation Review-Url: https://codereview.chromium.org/2840563004 Cr-Commit-Position: refs/heads/master@{#467167}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 75c885e..8b843be 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -76,7 +76,7 @@ #include "content/public/common/feature_h264_with_openh264_ffmpeg.h" #include "content/public/common/features.h" #include "device/base/features.h" -#include "device/vr/features.h" +#include "device/vr/features/features.h" #include "extensions/features/features.h" #include "gin/public/gin_features.h" #include "gpu/config/gpu_switches.h"