Skip to content

Commit

Permalink
Delete chrome://md-policy placeholder page.
Browse files Browse the repository at this point in the history
The placeholder was landed about 2 years ago. The feature was never implemented
and has been abandoned.

Bug: 134849
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Ibd798e3fbd38dda05342d33d5896a4066df0bb03
Reviewed-on: https://chromium-review.googlesource.com/596780
Reviewed-by: Drew Wilson <atwilson@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#493235}
  • Loading branch information
freshp86 authored and Commit Bot committed Aug 10, 2017
1 parent 795e9d6 commit a557c8a
Show file tree
Hide file tree
Showing 17 changed files with 0 additions and 210 deletions.
1 change: 0 additions & 1 deletion chrome/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -1551,7 +1551,6 @@ group("extra_resources") {
"//chrome/browser/resources:invalidations_resources",
"//chrome/browser/resources:net_internals_resources",
"//chrome/browser/resources:password_manager_internals_resources",
"//chrome/browser/resources:policy_resources",
"//chrome/browser/resources:quota_internals_resources",
"//chrome/browser/resources:task_scheduler_internals_resources",
"//chrome/browser/resources:translate_internals_resources",
Expand Down
4 changes: 0 additions & 4 deletions chrome/browser/about_flags.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1963,10 +1963,6 @@ const FeatureEntry kFeatureEntries[] = {
switches::kEnableMessageCenterNewStyleNotification,
switches::kDisableMessageCenterNewStyleNotification)},
#endif // !OS_ANDROID
{"enable-md-policy-page",
flag_descriptions::kEnableMaterialDesignPolicyPageName,
flag_descriptions::kEnableMaterialDesignPolicyPageDescription, kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignPolicyPage)},
#if defined(OS_CHROMEOS)
{"memory-pressure-thresholds",
flag_descriptions::kMemoryPressureThresholdName,
Expand Down
6 changes: 0 additions & 6 deletions chrome/browser/flag_descriptions.cc
Original file line number Diff line number Diff line change
Expand Up @@ -363,12 +363,6 @@ const char kEnableMaterialDesignFeedbackName[] =
const char kEnableMaterialDesignFeedbackDescription[] =
"If enabled, reporting an issue will load the Material Design feedback UI.";

const char kEnableMaterialDesignPolicyPageName[] =
"Enable Material Design policy page";
const char kEnableMaterialDesignPolicyPageDescription[] =
"If enabled, the chrome://md-policy URL loads the Material Design policy "
"page.";

const char kEnableMidiManagerDynamicInstantiationName[] =
"MIDIManager dynamic instantiation for Web MIDI.";
const char kEnableMidiManagerDynamicInstantiationDescription[] =
Expand Down
3 changes: 0 additions & 3 deletions chrome/browser/flag_descriptions.h
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,6 @@ extern const char kEnableMaterialDesignExtensionsDescription[];
extern const char kEnableMaterialDesignFeedbackName[];
extern const char kEnableMaterialDesignFeedbackDescription[];

extern const char kEnableMaterialDesignPolicyPageName[];
extern const char kEnableMaterialDesignPolicyPageDescription[];

extern const char kEnableMidiManagerDynamicInstantiationName[];
extern const char kEnableMidiManagerDynamicInstantiationDescription[];

Expand Down
12 changes: 0 additions & 12 deletions chrome/browser/resources/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,6 @@ grit("password_manager_internals_resources") {
output_dir = "$root_gen_dir/chrome"
}

grit("policy_resources") {
source = "md_policy/policy_resources.grd"
defines = chrome_grit_defines
outputs = [
"grit/policy_resources.h",
"grit/policy_resources_map.cc",
"grit/policy_resources_map.h",
"policy_resources.pak",
]
output_dir = "$root_gen_dir/chrome"
}

grit("quota_internals_resources") {
source = "quota_internals_resources.grd"
defines = chrome_grit_defines
Expand Down
10 changes: 0 additions & 10 deletions chrome/browser/resources/md_policy/md_policy.html

This file was deleted.

21 changes: 0 additions & 21 deletions chrome/browser/resources/md_policy/policy_resources.grd

This file was deleted.

2 changes: 0 additions & 2 deletions chrome/browser/ui/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,6 @@ split_static_library("ui") {
"webui/password_manager_internals/password_manager_internals_ui.h",
"webui/physical_web/physical_web_ui.cc",
"webui/physical_web/physical_web_ui.h",
"webui/policy_material_design_ui.cc",
"webui/policy_material_design_ui.h",
"webui/policy_ui.cc",
"webui/policy_ui.h",
"webui/policy_ui_handler.cc",
Expand Down
5 changes: 0 additions & 5 deletions chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
#include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"
#include "chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.h"
#include "chrome/browser/ui/webui/physical_web/physical_web_ui.h"
#include "chrome/browser/ui/webui/policy_material_design_ui.h"
#include "chrome/browser/ui/webui/policy_ui.h"
#include "chrome/browser/ui/webui/predictors/predictors_ui.h"
#include "chrome/browser/ui/webui/profiler_ui.h"
Expand Down Expand Up @@ -549,10 +548,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,

if (url.host_piece() == chrome::kChromeUIPolicyHost)
return &NewWebUI<PolicyUI>;
if (url.host_piece() == chrome::kChromeUIMdPolicyHost &&
switches::MdPolicyPageEnabled()) {
return &NewWebUI<PolicyMaterialDesignUI>;
}

#if BUILDFLAG(ENABLE_APP_LIST)
if (url.host_piece() == chrome::kChromeUIAppListStartPageHost)
Expand Down
102 changes: 0 additions & 102 deletions chrome/browser/ui/webui/policy_material_design_ui.cc

This file was deleted.

25 changes: 0 additions & 25 deletions chrome/browser/ui/webui/policy_material_design_ui.h

This file was deleted.

2 changes: 0 additions & 2 deletions chrome/chrome_paks.gni
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ template("chrome_extra_paks") {
"$root_gen_dir/chrome/invalidations_resources.pak",
"$root_gen_dir/chrome/net_internals_resources.pak",
"$root_gen_dir/chrome/password_manager_internals_resources.pak",
"$root_gen_dir/chrome/policy_resources.pak",
"$root_gen_dir/chrome/quota_internals_resources.pak",
"$root_gen_dir/chrome/task_scheduler_internals_resources.pak",
"$root_gen_dir/chrome/translate_internals_resources.pak",
Expand All @@ -111,7 +110,6 @@ template("chrome_extra_paks") {
"//chrome/browser/resources:invalidations_resources",
"//chrome/browser/resources:net_internals_resources",
"//chrome/browser/resources:password_manager_internals_resources",
"//chrome/browser/resources:policy_resources",
"//chrome/browser/resources:quota_internals_resources",
"//chrome/browser/resources:task_scheduler_internals_resources",
"//chrome/browser/resources:translate_internals_resources",
Expand Down
8 changes: 0 additions & 8 deletions chrome/common/chrome_switches.cc
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,6 @@ const char kEnableFastUnload[] = "enable-fast-unload";
// Enables the Material Design feedback form.
const char kEnableMaterialDesignFeedback[] = "enable-md-feedback";

// Enables the Material Design policy page at chrome://md-policy.
const char kEnableMaterialDesignPolicyPage[] = "enable-md-policy-page";

// Runs the Native Client inside the renderer process and enables GPU plugin
// (internally adds lEnableGpuPlugin to the command line).
const char kEnableNaCl[] = "enable-nacl";
Expand Down Expand Up @@ -1076,11 +1073,6 @@ bool MdFeedbackEnabled() {
::switches::kEnableMaterialDesignFeedback);
}

bool MdPolicyPageEnabled() {
return base::CommandLine::ForCurrentProcess()->HasSwitch(
::switches::kEnableMaterialDesignPolicyPage);
}

#if defined(OS_CHROMEOS)
bool PowerOverlayEnabled() {
return base::CommandLine::ForCurrentProcess()->HasSwitch(
Expand Down
2 changes: 0 additions & 2 deletions chrome/common/chrome_switches.h
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ extern const char kEnableExtensionActivityLogging[];
extern const char kEnableExtensionActivityLogTesting[];
extern const char kEnableFastUnload[];
extern const char kEnableMaterialDesignFeedback[];
extern const char kEnableMaterialDesignPolicyPage[];
extern const char kEnableNaCl[];
extern const char kEnableNavigationTracing[];
extern const char kEnableNetBenchmarking[];
Expand Down Expand Up @@ -346,7 +345,6 @@ extern const char kMemlog[];
bool ExtensionsDisabled(const base::CommandLine& command_line);
bool ExtensionsDisabled();
bool MdFeedbackEnabled();
bool MdPolicyPageEnabled();

#if defined(OS_CHROMEOS)
bool PowerOverlayEnabled();
Expand Down
2 changes: 0 additions & 2 deletions chrome/common/url_constants.cc
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ const char kChromeUIInspectURL[] = "chrome://inspect/";
const char kChromeUIInstantURL[] = "chrome://instant/";
const char kChromeUIInterstitialURL[] = "chrome://interstitials/";
const char kChromeUIInvalidationsURL[] = "chrome://invalidations/";
const char kChromeUIMdPolicyURL[] = "chrome://md-policy/";
const char kChromeUINaClURL[] = "chrome://nacl/";
const char kChromeUINetInternalsURL[] = "chrome://net-internals/";
const char kChromeUINewProfileURL[] = "chrome://newprofile/";
Expand Down Expand Up @@ -219,7 +218,6 @@ const char kChromeUIInvalidationsHost[] = "invalidations";
const char kChromeUIKillHost[] = "kill";
const char kChromeUILargeIconHost[] = "large-icon";
const char kChromeUILocalStateHost[] = "local-state";
const char kChromeUIMdPolicyHost[] = "md-policy";
const char kChromeUIMediaEngagementHost[] = "media-engagement";
const char kChromeUINaClHost[] = "nacl";
const char kChromeUINetExportHost[] = "net-export";
Expand Down
2 changes: 0 additions & 2 deletions chrome/common/url_constants.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ extern const char kChromeUIInspectURL[];
extern const char kChromeUIInstantURL[];
extern const char kChromeUIInterstitialURL[];
extern const char kChromeUIInvalidationsURL[];
extern const char kChromeUIMdPolicyURL[];
extern const char kChromeUIMediaEngagementHost[];
extern const char kChromeUINaClURL[];
extern const char kChromeUINetInternalsURL[];
Expand Down Expand Up @@ -208,7 +207,6 @@ extern const char kChromeUIInvalidationsHost[];
extern const char kChromeUIKillHost[];
extern const char kChromeUILargeIconHost[];
extern const char kChromeUILocalStateHost[];
extern const char kChromeUIMdPolicyHost[];
extern const char kChromeUINaClHost[];
extern const char kChromeUINetExportHost[];
extern const char kChromeUINetInternalsHost[];
Expand Down
3 changes: 0 additions & 3 deletions tools/gritsettings/resource_ids
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,6 @@
"chrome/browser/resources/invalidations_resources.grd": {
"includes": [11910],
},
"chrome/browser/resources/md_policy/policy_resources.grd": {
"structures": [11920],
},
"chrome/browser/resources/net_internals_resources.grd": {
"includes": [11960],
},
Expand Down

0 comments on commit a557c8a

Please sign in to comment.