conflict

microsoft · Jan 27, 2022 · 54eda74 · 54eda74
1 parent c42178d
commit 54eda74
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 7 deletions.
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -590,11 +590,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _Navigate(newSelectedItem.try_as<MUX::Controls::NavigationViewItem>().Tag().try_as<Editor::ProfileViewModel>(), BreadcrumbSubPage::None);
     }
 
-    bool MainPage::ShowBaseLayerMenuItem() const noexcept
-    {
-        return Feature_ShowProfileDefaultsInSettings::IsEnabled();
-    }
-
     IObservableVector<IInspectable> MainPage::Breadcrumbs() noexcept
     {
         return _breadcrumbs;

diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.h b/src/cascadia/TerminalSettingsEditor/MainPage.h
@@ -40,7 +40,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         bool TryPropagateHostingWindow(IInspectable object) noexcept;
         uint64_t GetHostingWindow() const noexcept;
 
-        bool ShowBaseLayerMenuItem() const noexcept;
         Windows::Foundation::Collections::IObservableVector<IInspectable> Breadcrumbs() noexcept;
 
         TYPED_EVENT(OpenJson, Windows::Foundation::IInspectable, Model::SettingsTarget);

diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.idl b/src/cascadia/TerminalSettingsEditor/MainPage.idl
@@ -38,7 +38,6 @@ namespace Microsoft.Terminal.Settings.Editor
         // Let's just smuggle the HWND in as a UInt64 :|
         void SetHostingWindow(UInt64 window);
 
-        Boolean ShowBaseLayerMenuItem { get; };
         Windows.Foundation.Collections.IObservableVector<IInspectable> Breadcrumbs { get; };
     }
 }