Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow embedder to bypass devtools prompt #27025

Merged
merged 2 commits into from Jun 22, 2020
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Prev

remove server panel

  • Loading branch information
paulrouget committed Jun 22, 2020
commit 9371b7222384fb2b851f0c95ed25306ad516dc22
@@ -325,14 +325,14 @@ void BrowserPage::OnDevtoolsButtonClicked(IInspectable const &,
mDevtoolsClient->Run();
std::wstring message =
resourceLoader.GetString(L"devtoolsStatus/Running").c_str();
std::wstring formatted = format(message, port.c_str());
DevtoolsStatusMessage().Text(formatted);
hstring formatted{format(message, port.c_str())};
OnDevtoolsMessage(servo::DevtoolsMessageLevel::None, L"", formatted);
} else if (mDevtoolsStatus == DevtoolsStatus::Failed) {
DevtoolsStatusMessage().Text(
resourceLoader.GetString(L"devtoolsStatus/Failed"));
auto body = resourceLoader.GetString(L"devtoolsStatus/Failed");
OnDevtoolsMessage(servo::DevtoolsMessageLevel::Error, L"", body);
} else if (mDevtoolsStatus == DevtoolsStatus::Stopped) {
DevtoolsStatusMessage().Text(
resourceLoader.GetString(L"devtoolsStatus/Stopped"));
auto body = resourceLoader.GetString(L"devtoolsStatus/Stopped");
OnDevtoolsMessage(servo::DevtoolsMessageLevel::None, L"", body);
}
}

@@ -186,9 +186,6 @@
<TextBox MinHeight="12" FontFamily="Consolas" FontSize="12" Grid.Row="1" IsTabStop="true" x:Name="JSInput" VerticalAlignment="Center" KeyUp="OnJSInputEdited" IsSpellCheckEnabled="False"/>
</Grid>
</muxc:TabViewItem>
<muxc:TabViewItem x:Uid="devtoolsTabServer" IsClosable="False">
<TextBlock x:Name="DevtoolsStatusMessage" Margin="10"></TextBlock>
</muxc:TabViewItem>
<muxc:TabViewItem x:Uid="devtoolsTabPrefs" IsClosable="False">
<Grid VerticalAlignment="Stretch">
<Grid.RowDefinitions>
@@ -108,9 +108,6 @@
<data name="urlTextbox.PlaceholderText" xml:space="preserve">
<value>Type a URL</value>
</data>
<data name="devtoolsTabServer.[using:Microsoft.UI.Xaml.Controls]TabViewItem.Header" xml:space="preserve">
<value>Devtools Server</value>
</data>
<data name="devtoolsTabConsole.[using:Microsoft.UI.Xaml.Controls]TabViewItem.Header" xml:space="preserve">
<value>Console</value>
</data>
@@ -104,9 +104,6 @@
<data name="urlTextbox.PlaceholderText" xml:space="preserve">
<value>Saisir une adresse</value>
</data>
<data name="devtoolsTabServer.[using:Microsoft.UI.Xaml.Controls]TabViewItem.Header" xml:space="preserve">
<value>Serveur DevTools</value>
</data>
<data name="devtoolsTabPrefs.[using:Microsoft.UI.Xaml.Controls]TabViewItem.Header" xml:space="preserve">
<value>Préférences</value>
</data>
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.