diff options
Diffstat (limited to 'src/core/favicon_service_factory_qt.cpp')
| -rw-r--r-- | src/core/favicon_service_factory_qt.cpp | 56 |
1 files changed, 13 insertions, 43 deletions
diff --git a/src/core/favicon_service_factory_qt.cpp b/src/core/favicon_service_factory_qt.cpp index 898882486..dd2a1979a 100644 --- a/src/core/favicon_service_factory_qt.cpp +++ b/src/core/favicon_service_factory_qt.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 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) 2021 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 #include "favicon_service_factory_qt.h" @@ -59,12 +23,17 @@ void HistoryClientQt::OnHistoryServiceCreated(history::HistoryService *history_s void HistoryClientQt::Shutdown() { } -bool HistoryClientQt::CanAddURL(const GURL &url) +static bool CanAddURL(const GURL &url) { Q_UNUSED(url); return true; } +history::CanAddURLCallback HistoryClientQt::GetThreadSafeCanAddURLCallback() const +{ + return base::BindRepeating(&CanAddURL); +} + void HistoryClientQt::NotifyProfileError(sql::InitStatus init_status, const std::string &diagnostics) { @@ -77,6 +46,10 @@ std::unique_ptr<history::HistoryBackendClient> HistoryClientQt::CreateBackendCli return nullptr; } +void HistoryClientQt::UpdateBookmarkLastUsedTime(const base::Uuid &, base::Time /*time*/) +{ +} + // static history::HistoryService * HistoryServiceFactoryQt::GetForBrowserContext(content::BrowserContext *context) @@ -84,8 +57,6 @@ HistoryServiceFactoryQt::GetForBrowserContext(content::BrowserContext *context) if (context->IsOffTheRecord()) return nullptr; - if (!base::PathExists(context->GetPath())) - return nullptr; return static_cast<history::HistoryService *>( GetInstance()->GetServiceForBrowserContext(context, true)); @@ -115,11 +86,10 @@ KeyedService * HistoryServiceFactoryQt::BuildServiceInstanceFor(content::BrowserContext *context) const { Q_ASSERT(!context->IsOffTheRecord()); - Q_ASSERT(base::PathExists(context->GetPath())); std::unique_ptr<history::HistoryService> historyService( new history::HistoryService(std::make_unique<HistoryClientQt>(), nullptr)); - if (!historyService->Init(history::HistoryDatabaseParamsForPath(context->GetPath()))) { + if (!historyService->Init(history::HistoryDatabaseParamsForPath(context->GetPath(), version_info::Channel::DEFAULT))) { return nullptr; } return historyService.release(); |