Commit f04621c5 authored by Christopher Grant's avatar Christopher Grant Committed by Commit Bot

VR: Remove VR keyboard flag

This flag has defaulted on for more than one release, and is no longer
needed.

BUG=
R=ymalik

Change-Id: I93f8aadb1e2cb78a558a7bdc5030fdf30d1dcff9
Reviewed-on: https://chromium-review.googlesource.com/1014350Reviewed-by: default avatarYash Malik <ymalik@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551321}
parent 1dd7d7fe
...@@ -2236,9 +2236,6 @@ const FeatureEntry kFeatureEntries[] = { ...@@ -2236,9 +2236,6 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_WITH_PARAMS_VALUE_TYPE(features::kWebXrRenderPath, FEATURE_WITH_PARAMS_VALUE_TYPE(features::kWebXrRenderPath,
kWebXrRenderPathVariations, kWebXrRenderPathVariations,
"WebXrRenderPath")}, "WebXrRenderPath")},
{"vr-browser-keyboard", flag_descriptions::kVrBrowserKeyboardName,
flag_descriptions::kVrBrowserKeyboardDescription, kOsAndroid,
FEATURE_VALUE_TYPE(features::kVrBrowserKeyboard)},
{"vr-web-input-editing", flag_descriptions::kVrWebInputEditingName, {"vr-web-input-editing", flag_descriptions::kVrWebInputEditingName,
flag_descriptions::kVrWebInputEditingDescription, kOsAndroid, flag_descriptions::kVrWebInputEditingDescription, kOsAndroid,
FEATURE_VALUE_TYPE(features::kVrWebInputEditing)}, FEATURE_VALUE_TYPE(features::kVrWebInputEditing)},
......
...@@ -56,7 +56,6 @@ void VrGLThread::SetInputConnection(VrInputConnection* input_connection) { ...@@ -56,7 +56,6 @@ void VrGLThread::SetInputConnection(VrInputConnection* input_connection) {
void VrGLThread::Init() { void VrGLThread::Init() {
bool keyboard_enabled = bool keyboard_enabled =
base::FeatureList::IsEnabled(features::kVrBrowserKeyboard) &&
!ui_initial_state_.web_vr_autopresentation_expected; !ui_initial_state_.web_vr_autopresentation_expected;
if (keyboard_enabled) { if (keyboard_enabled) {
keyboard_delegate_ = GvrKeyboardDelegate::Create(); keyboard_delegate_ = GvrKeyboardDelegate::Create();
......
...@@ -2976,10 +2976,6 @@ const char kWebVrVsyncAlignDescription[] = ...@@ -2976,10 +2976,6 @@ const char kWebVrVsyncAlignDescription[] =
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
const char kVrBrowserKeyboardName[] = "Chrome VR virtual keyboard.";
const char kVrBrowserKeyboardDescription[] =
"Enable a virtual keyboard for Chrome VR.";
const char kVrWebInputEditingName[] = "VR browsing web input editing"; const char kVrWebInputEditingName[] = "VR browsing web input editing";
const char kVrWebInputEditingDescription[] = const char kVrWebInputEditingDescription[] =
"Allow editing web input fields while in VR mode."; "Allow editing web input fields while in VR mode.";
......
...@@ -1825,9 +1825,6 @@ extern const char kWebVrVsyncAlignDescription[]; ...@@ -1825,9 +1825,6 @@ extern const char kWebVrVsyncAlignDescription[];
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
extern const char kVrBrowserKeyboardName[];
extern const char kVrBrowserKeyboardDescription[];
extern const char kVrWebInputEditingName[]; extern const char kVrWebInputEditingName[];
extern const char kVrWebInputEditingDescription[]; extern const char kVrWebInputEditingDescription[];
......
...@@ -2048,20 +2048,15 @@ void UiSceneCreator::CreateUrlBar() { ...@@ -2048,20 +2048,15 @@ void UiSceneCreator::CreateUrlBar() {
&Rect::SetColor); &Rect::SetColor);
scene_->AddUiElement(kUrlBarLayout, std::move(separator)); scene_->AddUiElement(kUrlBarLayout, std::move(separator));
base::RepeatingCallback<void()> url_click_callback; auto url_click_callback = base::BindRepeating(
if (base::FeatureList::IsEnabled(features::kVrBrowserKeyboard)) { [](Model* model, UiBrowserInterface* browser) {
url_click_callback = base::BindRepeating( if (model->needs_keyboard_update) {
[](Model* model, UiBrowserInterface* browser) { browser->OnUnsupportedMode(UiUnsupportedMode::kNeedsKeyboardUpdate);
if (model->needs_keyboard_update) { } else {
browser->OnUnsupportedMode(UiUnsupportedMode::kNeedsKeyboardUpdate); model->push_mode(kModeEditingOmnibox);
} else { }
model->push_mode(kModeEditingOmnibox); },
} base::Unretained(model_), base::Unretained(browser_));
},
base::Unretained(model_), base::Unretained(browser_));
} else {
url_click_callback = base::BindRepeating([] {});
}
auto origin_region = Create<Button>(kUrlBarOriginRegion, kPhaseForeground, auto origin_region = Create<Button>(kUrlBarOriginRegion, kPhaseForeground,
url_click_callback, audio_delegate_); url_click_callback, audio_delegate_);
......
...@@ -252,10 +252,6 @@ const base::Feature kExperimentalKeyboardLockUI{ ...@@ -252,10 +252,6 @@ const base::Feature kExperimentalKeyboardLockUI{
"ExperimentalKeyboardLockUI", base::FEATURE_DISABLED_BY_DEFAULT}; "ExperimentalKeyboardLockUI", base::FEATURE_DISABLED_BY_DEFAULT};
#if BUILDFLAG(ENABLE_VR) #if BUILDFLAG(ENABLE_VR)
// Enables the virtual keyboard for Chrome VR.
const base::Feature kVrBrowserKeyboard{"VrBrowserKeyboard",
base::FEATURE_ENABLED_BY_DEFAULT};
// Controls features related to VR browsing that are under development. // Controls features related to VR browsing that are under development.
const base::Feature kVrBrowsingExperimentalFeatures{ const base::Feature kVrBrowsingExperimentalFeatures{
"VrBrowsingExperimentalFeatures", base::FEATURE_DISABLED_BY_DEFAULT}; "VrBrowsingExperimentalFeatures", base::FEATURE_DISABLED_BY_DEFAULT};
......
...@@ -139,7 +139,6 @@ extern const base::Feature kExperimentalKeyboardLockUI; ...@@ -139,7 +139,6 @@ extern const base::Feature kExperimentalKeyboardLockUI;
extern const base::Feature kVrBrowsing; extern const base::Feature kVrBrowsing;
#endif #endif
#if BUILDFLAG(ENABLE_VR) #if BUILDFLAG(ENABLE_VR)
extern const base::Feature kVrBrowserKeyboard;
extern const base::Feature kVrBrowsingExperimentalFeatures; extern const base::Feature kVrBrowsingExperimentalFeatures;
extern const base::Feature kVrBrowsingExperimentalRendering; extern const base::Feature kVrBrowsingExperimentalRendering;
......
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