Commit 2cfbce2d authored by Christopher Grant's avatar Christopher Grant Committed by Commit Bot

Do not use ui::MaterialDesignController if on Android VR

Use of the material design controller in VR is generating crashes.  Its
use was likely unintentional.

BUG=874552
R=jdonelly

Change-Id: Id10449ebe736c3217fd4559c1b941d6e45404214
Reviewed-on: https://chromium-review.googlesource.com/1178963Reviewed-by: default avatarJustin Donnelly <jdonnelly@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584042}
parent 93573367
......@@ -199,9 +199,14 @@ const gfx::VectorIcon& AutocompleteMatch::TypeToVectorIcon(Type type,
bool is_bookmark,
bool is_tab_match) {
#if (!defined(OS_ANDROID) || BUILDFLAG(ENABLE_VR)) && !defined(OS_IOS)
#if !defined(OS_ANDROID)
const bool is_refresh_ui = ui::MaterialDesignController::IsRefreshUi();
const bool is_touch_ui =
ui::MaterialDesignController::IsTouchOptimizedUiEnabled();
#else
const bool is_refresh_ui = false;
const bool is_touch_ui = false;
#endif
if (is_bookmark) {
if (is_refresh_ui || is_touch_ui)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment