Skip to content

Commit 70d7a2d

Browse files
committed
Remove experimental option for external shell.
1 parent 52a3669 commit 70d7a2d

3 files changed

Lines changed: 5 additions & 19 deletions

File tree

Telegram/SourceFiles/settings/settings_experimental.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ For license and copyright information please follow this link:
2121
#include "ui/widgets/labels.h"
2222
#include "ui/vertical_list.h"
2323
#include "ui/gl/gl_detection.h"
24-
#include "ui/chat/attach/attach_bot_webview.h"
2524
#include "ui/chat/chat_style_radius.h"
2625
#include "ui/controls/compose_ai_button_factory.h"
2726
#include "base/options.h"
@@ -252,7 +251,6 @@ void SetupExperimental(
252251
addToggle(Info::Profile::kOptionShowPeerIdBelowAbout);
253252
addToggle(Info::Profile::kOptionShowChannelJoinedBelowAbout);
254253
addToggle(Ui::kOptionUseSmallMsgBubbleRadius);
255-
addToggle(Ui::BotWebView::kOptionLinuxExternalBotWebApps);
256254
addToggle(Media::Player::kOptionDisableAutoplayNext);
257255
addToggle(Webview::kOptionWebviewDebugEnabled);
258256
addToggle(Webview::kOptionWebviewLegacyEdge);

Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ For license and copyright information please follow this link:
3535
#include "webview/webview_interface.h"
3636
#include "base/debug_log.h"
3737
#include "base/invoke_queued.h"
38-
#include "base/options.h"
3938
#include "base/platform/base_platform_info.h"
4039
#include "base/qt_signal_producer.h"
4140
#include "base/random.h"
@@ -61,8 +60,6 @@ For license and copyright information please follow this link:
6160

6261
namespace Ui::BotWebView {
6362

64-
const char kOptionLinuxExternalBotWebApps[] = "linux-external-bot-webapps";
65-
6663
namespace {
6764

6865
constexpr auto kClipboardReadTimeout = crl::time(10000);
@@ -118,15 +115,6 @@ struct NativeMessage {
118115
&& url.fragment().isEmpty();
119116
}
120117

121-
base::options::toggle OptionLinuxExternalBotWebApps({
122-
.id = kOptionLinuxExternalBotWebApps,
123-
.name = "Use external Linux bot web app windows",
124-
.description = "Open bot web apps in a top-level WebKitGTK window"
125-
" with an HTML shell instead of embedding the GTK surface.",
126-
.scope = base::options::linux,
127-
.restartRequired = true,
128-
});
129-
130118
[[nodiscard]] RectPart ParsePosition(const QString &position) {
131119
if (position == u"left"_q) {
132120
return RectPart::Left;
@@ -318,9 +306,11 @@ void LogNativeMessageRejected(
318306
}
319307

320308
[[nodiscard]] bool UseExternalBotWebApps() {
321-
static const auto Result = OptionLinuxExternalBotWebApps.relevant()
322-
&& OptionLinuxExternalBotWebApps.value();
323-
return Result;
309+
#ifdef Q_OS_LINUX
310+
return true;
311+
#else // Q_OS_LINUX
312+
return false;
313+
#endif // Q_OS_LINUX
324314
}
325315

326316
[[nodiscard]] QColor ResolveExternalShellThemeColor(QColor color) {

Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ struct ResolvedColors;
4949

5050
namespace Ui::BotWebView {
5151

52-
extern const char kOptionLinuxExternalBotWebApps[];
53-
5452
struct DownloadsProgress;
5553
struct DownloadsEntry;
5654
enum class DownloadsAction;

0 commit comments

Comments
 (0)