diff options
Diffstat (limited to 'src/core/devtools_manager_delegate_qt.cpp')
| -rw-r--r-- | src/core/devtools_manager_delegate_qt.cpp | 61 |
1 files changed, 6 insertions, 55 deletions
diff --git a/src/core/devtools_manager_delegate_qt.cpp b/src/core/devtools_manager_delegate_qt.cpp index ecd2a7d40..6654ead0e 100644 --- a/src/core/devtools_manager_delegate_qt.cpp +++ b/src/core/devtools_manager_delegate_qt.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only // based on content/shell/browser/shell_devtools_manager_delegate.cc: // Copyright 2013 The Chromium Authors. All rights reserved. @@ -43,31 +7,19 @@ // found in the LICENSE.Chromium file. #include "devtools_manager_delegate_qt.h" +#include "qtwebengine/grit/qt_webengine_resources.h" #include "base/command_line.h" #include "base/files/file_path.h" -#include "base/memory/ptr_util.h" -#include "base/strings/string_number_conversions.h" -#include "base/strings/utf_string_conversions.h" #include "content/browser/devtools/devtools_http_handler.h" #include "content/public/browser/devtools_agent_host.h" -#include "content/public/browser/devtools_frontend_host.h" #include "content/public/browser/devtools_socket_factory.h" -#include "content/public/browser/favicon_status.h" -#include "content/public/browser/navigation_entry.h" -#include "content/public/browser/render_view_host.h" -#include "content/public/browser/web_contents.h" -#include "content/public/browser/web_contents_delegate.h" #include "content/public/common/content_switches.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" #include "net/socket/tcp_server_socket.h" #include "ui/base/resource/resource_bundle.h" -#include "qtwebengine/grit/qt_webengine_resources.h" - -#include "type_conversion.h" - using content::DevToolsAgentHost; namespace { @@ -93,7 +45,6 @@ private: const std::string m_address; int m_port; int m_backlog; - DISALLOW_COPY_AND_ASSIGN(TCPServerSocketFactory); }; } // namespace @@ -114,7 +65,7 @@ DevToolsServerQt::~DevToolsServerQt() void DevToolsServerQt::parseAddressAndPort() { - const QString inspectorEnv = QString::fromUtf8(qgetenv("QTWEBENGINE_REMOTE_DEBUGGING")); + const QString inspectorEnv = qEnvironmentVariable("QTWEBENGINE_REMOTE_DEBUGGING"); const base::CommandLine &commandLine = *base::CommandLine::ForCurrentProcess(); QString portStr; @@ -181,7 +132,7 @@ void DevToolsManagerDelegateQt::Initialized(const net::IPEndPoint *ip_address) std::string DevToolsManagerDelegateQt::GetDiscoveryPageHTML() { - return ui::ResourceBundle::GetSharedInstance().GetRawDataResource(IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string(); + return ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(IDR_DEVTOOLS_DISCOVERY_PAGE_HTML); } bool DevToolsManagerDelegateQt::HasBundledFrontendResources() @@ -189,4 +140,4 @@ bool DevToolsManagerDelegateQt::HasBundledFrontendResources() return true; } -} //namespace QtWebEngineCore +} // namespace QtWebEngineCore |