Commit 77b5c6c3 authored by Gordon Seto's avatar Gordon Seto Committed by Chromium LUCI CQ

[CrOS Settings] Fix blink ripple of back arrow in internet_detail_page.

Fix unnecessary blink of ripple effect seen at back arrow in Wi-Fi
details screen. This was caused because both settings_subpage and
internet_detail_page were focusing their own UI elements, causing
a flickering. This is solved by setting the settingId param in the url
so then settings_subpage does not attempt to focus its back button.

Fixes: 1150806
Change-Id: I9cc1a50188b76f32fb7b7ac2f2f489b197c963df
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2625330Reviewed-by: default avatarScott Violet <sky@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Gordon Seto <gordonseto@google.com>
Cr-Commit-Position: refs/heads/master@{#843079}
parent cf775955
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "chrome/browser/ui/webui/chromeos/internet_detail_dialog.h" #include "chrome/browser/ui/webui/chromeos/internet_detail_dialog.h"
#include "chrome/browser/ui/webui/chromeos/multidevice_setup/multidevice_setup_dialog.h" #include "chrome/browser/ui/webui/chromeos/multidevice_setup/multidevice_setup_dialog.h"
#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h" #include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
#include "chrome/browser/ui/webui/settings/chromeos/constants/setting.mojom.h"
#include "chrome/browser/upgrade_detector/upgrade_detector.h" #include "chrome/browser/upgrade_detector/upgrade_detector.h"
#include "chrome/browser/web_applications/components/web_app_id_constants.h" #include "chrome/browser/web_applications/components/web_app_id_constants.h"
#include "chrome/common/url_constants.h" #include "chrome/common/url_constants.h"
...@@ -458,6 +459,9 @@ void SystemTrayClient::ShowNetworkSettingsHelper(const std::string& network_id, ...@@ -458,6 +459,9 @@ void SystemTrayClient::ShowNetworkSettingsHelper(const std::string& network_id,
page += net::EscapeUrlEncodedData( page += net::EscapeUrlEncodedData(
chromeos::network_util::TranslateShillTypeToONC(network_state->type()), chromeos::network_util::TranslateShillTypeToONC(network_state->type()),
true); true);
page += "&settingId=";
page += base::NumberToString(static_cast<int32_t>(
chromeos::settings::mojom::Setting::kDisconnectWifiNetwork));
if (show_configure) if (show_configure)
page += "&showConfigure=true"; page += "&showConfigure=true";
} }
......
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