Commit ca03df00 authored by James Cook's avatar James Cook Committed by Commit Bot

Remove function chromeos::features::IsSplitSettingsEnabled()

SplitSettings has been on-by-default since M78. The flag has already
been removed, so delete this utility function as well.

Bug: 1026455
Change-Id: I579ccc6b2362271b91cab2bcdb0d3b2deb60ad1e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1985818Reviewed-by: default avatarToni Baržić <tbarzic@chromium.org>
Reviewed-by: default avatarMichael Wasserman <msw@chromium.org>
Auto-Submit: James Cook <jamescook@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728098}
parent 5a62b781
......@@ -15,7 +15,6 @@
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/webui/chromeos/system_web_dialog_delegate.h"
#include "chrome/common/webui_url_constants.h"
#include "chromeos/constants/chromeos_features.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/render_view_host.h"
......@@ -98,10 +97,6 @@ void OverrideWebkitPrefsForTabletMode(content::WebContents* contents,
void OverrideFontSize(content::WebContents* contents,
content::WebPreferences* web_prefs) {
DCHECK(contents);
// Prior to SplitSettings, system UI font size follows browser font size.
if (!chromeos::features::IsSplitSettingsEnabled())
return;
// Check the URL because |contents| may not yet be associated with a window,
// SettingsWindowManager, etc.
GURL url = GetURL(contents);
......
......@@ -52,7 +52,6 @@
#include "ash/public/cpp/multi_user_window_manager.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_helper.h"
#include "chrome/browser/ui/settings_window_manager_chromeos.h"
#include "chromeos/constants/chromeos_features.h"
#include "components/account_id/account_id.h"
#endif
......@@ -528,8 +527,7 @@ void Navigate(NavigateParams* params) {
if (source_browser) {
// If OS Settings is accessed in any means other than explicitly typing the
// URL into the URL bar, open OS Settings in its own standalone surface.
if (chromeos::features::IsSplitSettingsEnabled() &&
params->url.host() == chrome::kChromeUIOSSettingsHost &&
if (params->url.host() == chrome::kChromeUIOSSettingsHost &&
!PageTransitionCoreTypeIs(params->transition,
ui::PageTransition::PAGE_TRANSITION_TYPED)) {
chrome::SettingsWindowManager* settings_window_manager =
......
......@@ -12,7 +12,6 @@
#include "base/stl_util.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/views/chrome_web_dialog_view.h"
#include "chromeos/constants/chromeos_features.h"
#include "components/session_manager/core/session_manager.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/host_zoom_map.h"
......@@ -173,17 +172,15 @@ std::string SystemWebDialogDelegate::GetDialogArgs() const {
void SystemWebDialogDelegate::OnDialogShown(content::WebUI* webui) {
webui_ = webui;
if (features::IsSplitSettingsEnabled()) {
// System dialogs don't use the browser's default page zoom. Their contents
// stay at 100% to match the size of app list, shelf, status area, etc.
auto* web_contents = webui_->GetWebContents();
auto* rvh = web_contents->GetRenderViewHost();
auto* zoom_map = content::HostZoomMap::GetForWebContents(web_contents);
// Temporary means the lifetime of the WebContents.
zoom_map->SetTemporaryZoomLevel(rvh->GetProcess()->GetID(),
rvh->GetRoutingID(),
blink::PageZoomFactorToZoomLevel(1.0));
}
// System dialogs don't use the browser's default page zoom. Their contents
// stay at 100% to match the size of app list, shelf, status area, etc.
auto* web_contents = webui_->GetWebContents();
auto* rvh = web_contents->GetRenderViewHost();
auto* zoom_map = content::HostZoomMap::GetForWebContents(web_contents);
// Temporary means the lifetime of the WebContents.
zoom_map->SetTemporaryZoomLevel(rvh->GetProcess()->GetID(),
rvh->GetRoutingID(),
blink::PageZoomFactorToZoomLevel(1.0));
}
void SystemWebDialogDelegate::OnDialogClosed(const std::string& json_retval) {
......
......@@ -311,11 +311,6 @@ bool IsQuickAnswersEnabled() {
return base::FeatureList::IsEnabled(kQuickAnswers);
}
bool IsSplitSettingsEnabled() {
// TODO(dpapad): Remove all calls to this function.
return true;
}
bool IsSplitSettingsSyncEnabled() {
return base::FeatureList::IsEnabled(kSplitSettingsSync);
}
......
......@@ -139,7 +139,6 @@ COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
bool IsInstantTetheringBackgroundAdvertisingSupported();
COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsParentalControlsSettingsEnabled();
COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsQuickAnswersEnabled();
COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsSplitSettingsEnabled();
COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsSplitSettingsSyncEnabled();
// TODO(michaelpg): Remove after M71 branch to re-enable Play Store by default.
......
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