Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(355)

Side by Side Diff: chrome/browser/notifications/notification_platform_bridge_linux.cc

Issue 2886903005: Linux native notifications: Require 'actions' and 'body' capabilities (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/notifications/notification_platform_bridge_linux_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/notifications/notification_platform_bridge_linux.h" 5 #include "chrome/browser/notifications/notification_platform_bridge_linux.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <memory> 8 #include <memory>
9 #include <set> 9 #include <set>
10 #include <sstream> 10 #include <sstream>
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 notification_proxy_->CallMethodAndBlock( 419 notification_proxy_->CallMethodAndBlock(
420 &get_capabilities_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT); 420 &get_capabilities_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT);
421 if (capabilities_response) { 421 if (capabilities_response) {
422 dbus::MessageReader reader(capabilities_response.get()); 422 dbus::MessageReader reader(capabilities_response.get());
423 std::vector<std::string> capabilities; 423 std::vector<std::string> capabilities;
424 reader.PopArrayOfStrings(&capabilities); 424 reader.PopArrayOfStrings(&capabilities);
425 for (const std::string& capability : capabilities) 425 for (const std::string& capability : capabilities)
426 capabilities_.insert(capability); 426 capabilities_.insert(capability);
427 } 427 }
428 RecordMetricsForCapabilities(); 428 RecordMetricsForCapabilities();
429 if (!base::ContainsKey(capabilities_, kCapabilityBody) ||
430 !base::ContainsKey(capabilities_, kCapabilityActions)) {
431 OnConnectionInitializationFinishedOnTaskRunner(
432 ConnectionInitializationStatusCode::MISSING_REQUIRED_CAPABILITIES);
433 return;
434 }
429 PostTaskToUiThread(base::BindOnce( 435 PostTaskToUiThread(base::BindOnce(
430 &NotificationPlatformBridgeLinuxImpl::SetBodyImagesSupported, this, 436 &NotificationPlatformBridgeLinuxImpl::SetBodyImagesSupported, this,
431 base::ContainsKey(capabilities_, kCapabilityBodyImages))); 437 base::ContainsKey(capabilities_, kCapabilityBodyImages)));
432 438
433 connected_signals_barrier_ = base::BarrierClosure( 439 connected_signals_barrier_ = base::BarrierClosure(
434 2, base::Bind(&NotificationPlatformBridgeLinuxImpl:: 440 2, base::Bind(&NotificationPlatformBridgeLinuxImpl::
435 OnConnectionInitializationFinishedOnTaskRunner, 441 OnConnectionInitializationFinishedOnTaskRunner,
436 this, ConnectionInitializationStatusCode::SUCCESS)); 442 this, ConnectionInitializationStatusCode::SUCCESS));
437 notification_proxy_->ConnectToSignal( 443 notification_proxy_->ConnectToSignal(
438 kFreedesktopNotificationsName, kSignalActionInvoked, 444 kFreedesktopNotificationsName, kSignalActionInvoked,
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
897 } 903 }
898 904
899 void NotificationPlatformBridgeLinux::SetReadyCallback( 905 void NotificationPlatformBridgeLinux::SetReadyCallback(
900 NotificationBridgeReadyCallback callback) { 906 NotificationBridgeReadyCallback callback) {
901 impl_->SetReadyCallback(std::move(callback)); 907 impl_->SetReadyCallback(std::move(callback));
902 } 908 }
903 909
904 void NotificationPlatformBridgeLinux::CleanUp() { 910 void NotificationPlatformBridgeLinux::CleanUp() {
905 impl_->CleanUp(); 911 impl_->CleanUp();
906 } 912 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/notifications/notification_platform_bridge_linux_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698