Skip to content

Commit 716cb28

Browse files
electron-botnornagon
electron-bot
authored and
nornagon
committed
chore: bump chromium to 1e9f9a24aa12 (master) (electron#17880)
* chore: bump chromium in DEPS to 1e9f9a24aa12bea9cf194a82a7e249bd1242ec4f * chore: update patches * Make WebContents' theme color a base::Optional<SkColor> https://chromium-review.googlesource.com/c/chromium/src/+/1540022 * update autofill patch for incorrect header includes * Move Shell messages to web_test and rename to BlinkTest. https://chromium-review.googlesource.com/c/chromium/src/+/1525181 * Make PlatformNotificationServiceImpl a KeyedService. https://chromium-review.googlesource.com/c/chromium/src/+/1336150 * Move MediaPlayerId to its own file. https://chromium-review.googlesource.com/c/chromium/src/+/1547057 * Remove net/base/completion_callback.h, which is no longer used https://chromium-review.googlesource.com/c/chromium/src/+/1552821 * AW NS: support file scheme cookies https://chromium-review.googlesource.com/c/chromium/src/+/1533486 * Remove SecurityInfo and adapt remaining consumers https://chromium-review.googlesource.com/c/chromium/src/+/1509455 * Remove deprecated type-specific number to string conversion functions https://chromium-review.googlesource.com/c/chromium/src/+/1545881 * DevTools: Adding new performance histograms for launch of top 4 tools https://chromium-review.googlesource.com/c/chromium/src/+/1506388 * Update include paths for //base/hash/hash.h https://chromium-review.googlesource.com/c/chromium/src/+/1544630 * build: Disable ensure_gn_version gclient hook for mac CI checkout * update patches * use maybe version of v8::String::NewFromTwoByte * bump appveyor image version * fix mac ci hopefully * Convert enum to enum class for MenuAnchorPosition https://chromium-review.googlesource.com/c/chromium/src/+/1530508 * use maybe version of ToObject * RenderViewHost::GetProcess is no longer const * Unrefcount AuthChallengeInfo https://chromium-review.googlesource.com/c/chromium/src/+/1550631 * MenuButtonController takes Button rather than MenuButton https://chromium-review.googlesource.com/c/chromium/src/+/1500935 * add //ui/views_bridge_mac to deps to fix link error * forward declare views::Button in atom::MenuDelegate * more v8 patches * base/{=> hash}/md5.h https://chromium-review.googlesource.com/c/chromium/src/+/1535124 * gfx::{PlatformFontWin => win}::* https://chromium-review.googlesource.com/c/chromium/src/+/1534178 * fix v8 patches * [base] Rename TaskScheduler to ThreadPool https://chromium-review.googlesource.com/c/chromium/src/+/1561552 * use internal_config_base for bytecode_builtins_list_generator avoids windows link errors * FIXME: temporarily disable v8/breakpad integration * FIXME: temporarily disable prevent-will-redirect test * FIXME: disable neon on aarch64 pending crbug.com/953815 * update to account for WebCursor refactor https://chromium-review.googlesource.com/c/chromium/src/+/1562755 * enable stack dumping on appveyor * Revert "FIXME: disable neon on aarch64 pending crbug.com/953815" This reverts commit 57f0820. * fix: remove const qualifiers to match upstream * fix: remove const qualifiers to match upstream in cc files as well * don't throw an error when testing if an object is an object * use non-deprecated Buffer constructor * Remove net::CookieSameSite::DEFAULT_MODE enum value https://chromium-review.googlesource.com/c/chromium/src/+/1567955 * depend on modded dbus-native to work around buffer deprecation sidorares/dbus-native#262 * revert clang roll to fix arm build on linux * fixup! depend on modded dbus-native to work around buffer deprecation need more coffee * update coffee-script * robustify verify-mksnapshot w.r.t. command-line parameters * Revert "robustify verify-mksnapshot w.r.t. command-line parameters" This reverts commit a49af01. * fix mksnapshot by matching args * update patches * TMP: enable rdp on appveyor * Changed ContentBrowserClient::CreateQuotaPermissionContext() to return scoped_refptr. https://chromium-review.googlesource.com/c/chromium/src/+/1569376 * Make content::ResourceType an enum class. https://chromium-review.googlesource.com/c/chromium/src/+/1569345 * fixup! Make content::ResourceType an enum class. * turn off rdp * use net::CompletionRepeatingCallback instead of base::Callback<void(int)> * remove disable_ensure_gn_version_gclient_hook.patch * copy repeating callback instead of std::move * fix lint * add completion_repeating_callback.h include
1 parent ab009bb commit 716cb28

File tree

126 files changed

+1267
-621
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+1267
-621
lines changed

Diff for: ‎BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,7 @@ static_library("electron_lib") {
547547
deps += [
548548
"//third_party/crashpad/crashpad/client",
549549
"//ui/accelerated_widget_mac",
550+
"//ui/views_bridge_mac",
550551
]
551552
sources += [
552553
"atom/browser/ui/views/autofill_popup_view.cc",

Diff for: ‎DEPS

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ gclient_gn_args = [
1010

1111
vars = {
1212
'chromium_version':
13-
'75.0.3740.3',
13+
'1e9f9a24aa12bea9cf194a82a7e249bd1242ec4f',
1414
'node_version':
1515
'2dc0f8811b2b295c08d797b8a11b030234c98502',
1616

Diff for: ‎appveyor.yml

+8-3
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,18 @@
2323
# https://www.appveyor.com/docs/build-configuration/#secure-variables
2424
# https://www.appveyor.com/docs/build-configuration/#custom-environment-variables
2525

26+
# Uncomment these lines to enable RDP
27+
#on_finish:
28+
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
29+
2630
version: 1.0.{build}
2731
build_cloud: libcc-20
28-
image: libcc-20-vs2017-15.7.4
32+
image: libcc-20-vs2017-15.9
2933
environment:
3034
GIT_CACHE_PATH: C:\Users\electron\libcc_cache
3135
DISABLE_CRASH_REPORTER_TESTS: true
3236
ELECTRON_OUT_DIR: Default
37+
ELECTRON_ENABLE_STACK_DUMPING: 1
3338
build_script:
3439
- ps: >-
3540
if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
@@ -38,7 +43,7 @@ build_script:
3843
- echo "Building $env:GN_CONFIG build"
3944
- git config --global core.longpaths true
4045
- cd ..
41-
- md src
46+
- ps: if (Test-Path src\electron) { Remove-Item src\electron -Recurse }
4247
- ps: Move-Item $env:APPVEYOR_BUILD_FOLDER -Destination src\electron
4348
- ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools"
4449
- ps: $env:SCCACHE_PATH="$pwd\src\electron\external_binaries\sccache.exe"
@@ -52,7 +57,7 @@ build_script:
5257
--unmanaged
5358
%GCLIENT_EXTRA_ARGS%
5459
"https://github.com/electron/electron"
55-
- gclient sync --with_branch_heads --with_tags
60+
- gclient sync --with_branch_heads --with_tags --reset
5661
- cd src
5762
- ps: $env:BUILD_CONFIG_PATH="//electron/build/args/%GN_CONFIG%.gn"
5863
- gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") %GN_EXTRA_ARGS%"

Diff for: ‎atom/app/node_main.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "atom/common/node_includes.h"
1919
#include "base/command_line.h"
2020
#include "base/feature_list.h"
21-
#include "base/task/task_scheduler/task_scheduler.h"
21+
#include "base/task/thread_pool/thread_pool.h"
2222
#include "base/threading/thread_task_runner_handle.h"
2323
#include "gin/array_buffer.h"
2424
#include "gin/public/isolate_holder.h"
@@ -48,7 +48,7 @@ int NodeMain(int argc, char* argv[]) {
4848
gin::V8Initializer::LoadV8Natives();
4949

5050
// V8 requires a task scheduler apparently
51-
base::TaskScheduler::CreateAndStartWithDefaultParams("Electron");
51+
base::ThreadPool::CreateAndStartWithDefaultParams("Electron");
5252

5353
// Initialize gin::IsolateHolder.
5454
JavascriptEnvironment gin_env(loop);
@@ -112,10 +112,10 @@ int NodeMain(int argc, char* argv[]) {
112112

113113
// According to "src/gin/shell/gin_main.cc":
114114
//
115-
// gin::IsolateHolder waits for tasks running in TaskScheduler in its
116-
// destructor and thus must be destroyed before TaskScheduler starts skipping
115+
// gin::IsolateHolder waits for tasks running in ThreadPool in its
116+
// destructor and thus must be destroyed before ThreadPool starts skipping
117117
// CONTINUE_ON_SHUTDOWN tasks.
118-
base::TaskScheduler::GetInstance()->Shutdown();
118+
base::ThreadPool::GetInstance()->Shutdown();
119119

120120
v8::V8::Dispose();
121121

Diff for: ‎atom/browser/api/atom_api_app.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ void App::OnLogin(scoped_refptr<LoginHandler> login_handler,
672672
if (web_contents) {
673673
prevent_default = Emit(
674674
"login", WebContents::FromOrCreate(isolate(), web_contents),
675-
request_details, login_handler->auth_info(),
675+
request_details, *login_handler->auth_info(),
676676
base::Bind(&PassLoginInformation, base::RetainedRef(login_handler)));
677677
}
678678

@@ -1056,7 +1056,7 @@ Browser::LoginItemSettings App::GetLoginItemSettings(mate::Arguments* args) {
10561056

10571057
#if defined(USE_NSS_CERTS)
10581058
void App::ImportCertificate(const base::DictionaryValue& options,
1059-
const net::CompletionCallback& callback) {
1059+
net::CompletionRepeatingCallback callback) {
10601060
auto browser_context = AtomBrowserContext::From("", false);
10611061
if (!certificate_manager_model_) {
10621062
auto copy = base::DictionaryValue::From(
@@ -1069,17 +1069,17 @@ void App::ImportCertificate(const base::DictionaryValue& options,
10691069
}
10701070

10711071
int rv = ImportIntoCertStore(certificate_manager_model_.get(), options);
1072-
callback.Run(rv);
1072+
std::move(callback).Run(rv);
10731073
}
10741074

10751075
void App::OnCertificateManagerModelCreated(
10761076
std::unique_ptr<base::DictionaryValue> options,
1077-
const net::CompletionCallback& callback,
1077+
net::CompletionOnceCallback callback,
10781078
std::unique_ptr<CertificateManagerModel> model) {
10791079
certificate_manager_model_ = std::move(model);
10801080
int rv =
10811081
ImportIntoCertStore(certificate_manager_model_.get(), *(options.get()));
1082-
callback.Run(rv);
1082+
std::move(callback).Run(rv);
10831083
}
10841084
#endif
10851085

Diff for: ‎atom/browser/api/atom_api_app.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
#include "content/public/browser/render_process_host.h"
2828
#include "native_mate/dictionary.h"
2929
#include "native_mate/handle.h"
30-
#include "net/base/completion_callback.h"
30+
#include "net/base/completion_once_callback.h"
31+
#include "net/base/completion_repeating_callback.h"
3132
#include "net/ssl/client_cert_identity.h"
3233

3334
#if defined(USE_NSS_CERTS)
@@ -78,7 +79,7 @@ class App : public AtomBrowserClient::Delegate,
7879
#if defined(USE_NSS_CERTS)
7980
void OnCertificateManagerModelCreated(
8081
std::unique_ptr<base::DictionaryValue> options,
81-
const net::CompletionCallback& callback,
82+
net::CompletionOnceCallback callback,
8283
std::unique_ptr<CertificateManagerModel> model);
8384
#endif
8485

@@ -199,7 +200,7 @@ class App : public AtomBrowserClient::Delegate,
199200
Browser::LoginItemSettings GetLoginItemSettings(mate::Arguments* args);
200201
#if defined(USE_NSS_CERTS)
201202
void ImportCertificate(const base::DictionaryValue& options,
202-
const net::CompletionCallback& callback);
203+
net::CompletionRepeatingCallback callback);
203204
#endif
204205
v8::Local<v8::Promise> GetFileIcon(const base::FilePath& path,
205206
mate::Arguments* args);

Diff for: ‎atom/browser/api/atom_api_cookies.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
283283
net::CanonicalCookie::CreateSanitizedCookie(
284284
url, name, value, domain, path, creation_time, expiration_time,
285285
last_access_time, secure, http_only,
286-
net::CookieSameSite::DEFAULT_MODE, net::COOKIE_PRIORITY_DEFAULT));
286+
net::CookieSameSite::NO_RESTRICTION, net::COOKIE_PRIORITY_DEFAULT));
287287
auto completion_callback = base::BindOnce(OnSetCookie, std::move(promise));
288288
if (!canonical_cookie || !canonical_cookie->IsCanonical()) {
289289
std::move(completion_callback)

Diff for: ‎atom/browser/api/atom_api_desktop_capturer.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,13 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
176176
const int64_t device_id =
177177
display::win::DisplayInfo::DeviceIdFromDeviceName(
178178
wide_device_name.c_str());
179-
source.display_id = base::Int64ToString(device_id);
179+
source.display_id = base::NumberToString(device_id);
180180
}
181181
}
182182
#elif defined(OS_MACOSX)
183183
// On Mac, the IDs across the APIs match.
184184
for (auto& source : screen_sources) {
185-
source.display_id = base::Int64ToString(source.media_list_source.id.id);
185+
source.display_id = base::NumberToString(source.media_list_source.id.id);
186186
}
187187
#endif // defined(OS_WIN)
188188
// TODO(ajmacd): Add Linux support. The IDs across APIs differ but Chrome

Diff for: ‎atom/browser/api/atom_api_menu_views.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void MenuViews::PopupAt(TopLevelWindow* window,
5252
std::make_unique<MenuRunner>(model(), flags, close_callback);
5353
menu_runners_[window_id]->RunMenuAt(
5454
native_window->widget(), NULL, gfx::Rect(location, gfx::Size()),
55-
views::MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_MOUSE);
55+
views::MenuAnchorPosition::kTopLeft, ui::MENU_SOURCE_MOUSE);
5656
}
5757

5858
void MenuViews::ClosePopupAt(int32_t window_id) {

Diff for: ‎atom/browser/api/atom_api_session.cc

+5-3
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
#include "content/public/browser/storage_partition.h"
4949
#include "native_mate/dictionary.h"
5050
#include "native_mate/object_template_builder.h"
51+
#include "net/base/completion_repeating_callback.h"
5152
#include "net/base/load_flags.h"
5253
#include "net/disk_cache/disk_cache.h"
5354
#include "net/dns/host_cache.h" // nogncheck
@@ -268,7 +269,7 @@ void DoCacheActionInIO(
268269
// Call GetBackend and make the backend's ptr accessable in OnGetBackend.
269270
using BackendPtr = disk_cache::Backend*;
270271
auto** backend_ptr = new BackendPtr(nullptr);
271-
net::CompletionCallback on_get_backend =
272+
net::CompletionRepeatingCallback on_get_backend =
272273
base::Bind(&OnGetBackend, base::Owned(backend_ptr), action,
273274
util::CopyablePromise(promise));
274275
int rv = http_cache->GetBackend(backend_ptr, on_get_backend);
@@ -365,8 +366,9 @@ void DestroyGlobalHandle(v8::Isolate* isolate,
365366
v8::HandleScope handle_scope(isolate);
366367
if (!global_handle.IsEmpty()) {
367368
v8::Local<v8::Value> local_handle = global_handle.Get(isolate);
368-
if (local_handle->IsObject()) {
369-
v8::Local<v8::Object> object = local_handle->ToObject(isolate);
369+
v8::Local<v8::Object> object;
370+
if (local_handle->IsObject() &&
371+
local_handle->ToObject(isolate->GetCurrentContext()).ToLocal(&object)) {
370372
void* ptr = object->GetAlignedPointerFromInternalField(0);
371373
if (!ptr)
372374
return;

Diff for: ‎atom/browser/api/atom_api_session.h

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "base/values.h"
1616
#include "content/public/browser/download_manager.h"
1717
#include "native_mate/handle.h"
18-
#include "net/base/completion_callback.h"
1918

2019
class GURL;
2120

Diff for: ‎atom/browser/api/atom_api_top_level_window.cc

+4-3
Original file line numberDiff line numberDiff line change
@@ -648,10 +648,11 @@ void TopLevelWindow::SetFocusable(bool focusable) {
648648
}
649649

650650
void TopLevelWindow::SetMenu(v8::Isolate* isolate, v8::Local<v8::Value> value) {
651+
auto context = isolate->GetCurrentContext();
651652
mate::Handle<Menu> menu;
652-
if (value->IsObject() &&
653-
gin::V8ToString(
654-
isolate, value->ToObject(isolate)->GetConstructorName()) == "Menu" &&
653+
v8::Local<v8::Object> object;
654+
if (value->IsObject() && value->ToObject(context).ToLocal(&object) &&
655+
gin::V8ToString(isolate, object->GetConstructorName()) == "Menu" &&
655656
mate::ConvertFromV8(isolate, value, &menu) && !menu.IsEmpty()) {
656657
menu_.Reset(isolate, menu.ToV8());
657658
window_->SetMenu(menu->model());

Diff for: ‎atom/browser/api/atom_api_url_request.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ void URLRequest::OnReceivedRedirect(
354354
}
355355

356356
void URLRequest::OnAuthenticationRequired(
357-
scoped_refptr<const net::AuthChallengeInfo> auth_info) {
357+
const net::AuthChallengeInfo& auth_info) {
358358
if (request_state_.Canceled() || request_state_.Closed()) {
359359
return;
360360
}
@@ -364,7 +364,7 @@ void URLRequest::OnAuthenticationRequired(
364364
return;
365365
}
366366

367-
Emit("login", auth_info.get(),
367+
Emit("login", auth_info,
368368
base::Bind(&AtomURLRequest::PassLoginInformation, atom_request_));
369369
}
370370

Diff for: ‎atom/browser/api/atom_api_url_request.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@ class URLRequest : public mate::EventEmitter<URLRequest> {
105105
const std::string& method,
106106
const GURL& url,
107107
scoped_refptr<net::HttpResponseHeaders> response_headers);
108-
void OnAuthenticationRequired(
109-
scoped_refptr<const net::AuthChallengeInfo> auth_info);
108+
void OnAuthenticationRequired(const net::AuthChallengeInfo& auth_info);
110109
void OnResponseStarted(
111110
scoped_refptr<net::HttpResponseHeaders> response_headers);
112111
void OnResponseData(scoped_refptr<const net::IOBufferWithSize> data);

Diff for: ‎atom/browser/api/atom_api_web_contents.cc

+9-9
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
#include "net/url_request/url_request_context.h"
8787
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
8888
#include "third_party/blink/public/mojom/frame/find_in_page.mojom.h"
89+
#include "third_party/blink/public/platform/web_cursor_info.h"
8990
#include "third_party/blink/public/platform/web_input_event.h"
9091
#include "ui/display/screen.h"
9192
#include "ui/events/base_event_utils.h"
@@ -807,20 +808,20 @@ void WebContents::PluginCrashed(const base::FilePath& plugin_path,
807808
}
808809

809810
void WebContents::MediaStartedPlaying(const MediaPlayerInfo& video_type,
810-
const MediaPlayerId& id) {
811+
const content::MediaPlayerId& id) {
811812
Emit("media-started-playing");
812813
}
813814

814815
void WebContents::MediaStoppedPlaying(
815816
const MediaPlayerInfo& video_type,
816-
const MediaPlayerId& id,
817+
const content::MediaPlayerId& id,
817818
content::WebContentsObserver::MediaStoppedReason reason) {
818819
Emit("media-paused");
819820
}
820821

821-
void WebContents::DidChangeThemeColor(SkColor theme_color) {
822-
if (theme_color != SK_ColorTRANSPARENT) {
823-
Emit("did-change-theme-color", atom::ToRGBHex(theme_color));
822+
void WebContents::DidChangeThemeColor(base::Optional<SkColor> theme_color) {
823+
if (theme_color) {
824+
Emit("did-change-theme-color", atom::ToRGBHex(theme_color.value()));
824825
} else {
825826
Emit("did-change-theme-color", nullptr);
826827
}
@@ -1192,7 +1193,7 @@ void WebContents::SetBackgroundThrottling(bool allowed) {
11921193
return;
11931194
}
11941195

1195-
const auto* render_view_host = contents->GetRenderViewHost();
1196+
auto* render_view_host = contents->GetRenderViewHost();
11961197
if (!render_view_host) {
11971198
return;
11981199
}
@@ -1915,10 +1916,9 @@ v8::Local<v8::Promise> WebContents::CapturePage(mate::Arguments* args) {
19151916
}
19161917

19171918
void WebContents::OnCursorChange(const content::WebCursor& cursor) {
1918-
content::CursorInfo info;
1919-
cursor.GetCursorInfo(&info);
1919+
const content::CursorInfo& info = cursor.info();
19201920

1921-
if (cursor.IsCustom()) {
1921+
if (info.type == blink::WebCursorInfo::kTypeCustom) {
19221922
Emit("cursor-changed", CursorTypeToString(info),
19231923
gfx::Image::CreateFrom1xBitmap(info.custom_image),
19241924
info.image_scale_factor,

Diff for: ‎atom/browser/api/atom_api_web_contents.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -445,12 +445,12 @@ class WebContents : public mate::TrackableObject<WebContents>,
445445
void PluginCrashed(const base::FilePath& plugin_path,
446446
base::ProcessId plugin_pid) override;
447447
void MediaStartedPlaying(const MediaPlayerInfo& video_type,
448-
const MediaPlayerId& id) override;
448+
const content::MediaPlayerId& id) override;
449449
void MediaStoppedPlaying(
450450
const MediaPlayerInfo& video_type,
451-
const MediaPlayerId& id,
451+
const content::MediaPlayerId& id,
452452
content::WebContentsObserver::MediaStoppedReason reason) override;
453-
void DidChangeThemeColor(SkColor theme_color) override;
453+
void DidChangeThemeColor(base::Optional<SkColor> theme_color) override;
454454
void OnInterfaceRequestFromFrame(
455455
content::RenderFrameHost* render_frame_host,
456456
const std::string& interface_name,

Diff for: ‎atom/browser/atom_browser_client.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ std::string AtomBrowserClient::GetGeolocationApiKey() {
534534
return api_key;
535535
}
536536

537-
content::QuotaPermissionContext*
537+
scoped_refptr<content::QuotaPermissionContext>
538538
AtomBrowserClient::CreateQuotaPermissionContext() {
539539
return new AtomQuotaPermissionContext;
540540
}
@@ -867,7 +867,8 @@ NotificationPresenter* AtomBrowserClient::GetNotificationPresenter() {
867867
}
868868

869869
content::PlatformNotificationService*
870-
AtomBrowserClient::GetPlatformNotificationService() {
870+
AtomBrowserClient::GetPlatformNotificationService(
871+
content::BrowserContext* browser_context) {
871872
if (!notification_service_) {
872873
notification_service_.reset(new PlatformNotificationService(this));
873874
}

Diff for: ‎atom/browser/atom_browser_client.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ class AtomBrowserClient : public content::ContentBrowserClient,
9090
base::CommandLine* command_line) override;
9191
void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override;
9292
std::string GetGeolocationApiKey() override;
93-
content::QuotaPermissionContext* CreateQuotaPermissionContext() override;
93+
scoped_refptr<content::QuotaPermissionContext> CreateQuotaPermissionContext()
94+
override;
9495
content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings(
9596
content::BrowserContext* context) override;
9697
void AllowCertificateError(
@@ -144,8 +145,8 @@ class AtomBrowserClient : public content::ContentBrowserClient,
144145
net::NetLog* GetNetLog() override;
145146
content::MediaObserver* GetMediaObserver() override;
146147
content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() override;
147-
content::PlatformNotificationService* GetPlatformNotificationService()
148-
override;
148+
content::PlatformNotificationService* GetPlatformNotificationService(
149+
content::BrowserContext* browser_context) override;
149150
content::BrowserMainParts* CreateBrowserMainParts(
150151
const content::MainFunctionParams&) override;
151152
base::FilePath GetDefaultDownloadDirectory() override;

0 commit comments

Comments
 (0)