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

Unified Diff: chrome/browser/chromeos/net/wake_on_wifi_manager.cc

Issue 823703004: Tracking push events for lucid sleep (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Kill renderer if it sends a bad message id Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/net/wake_on_wifi_manager.cc
diff --git a/chrome/browser/chromeos/net/wake_on_wifi_manager.cc b/chrome/browser/chromeos/net/wake_on_wifi_manager.cc
index 5584524f1aa66098c896412cf2315d3985cabf48..d214a75069725176c625414dd501ad3198c86157 100644
--- a/chrome/browser/chromeos/net/wake_on_wifi_manager.cc
+++ b/chrome/browser/chromeos/net/wake_on_wifi_manager.cc
@@ -141,6 +141,7 @@ WakeOnWifiManager* WakeOnWifiManager::Get() {
WakeOnWifiManager::WakeOnWifiManager()
: current_feature_(WakeOnWifiManager::INVALID),
+ extension_event_observer_(new ExtensionEventObserver()),
weak_ptr_factory_(this) {
// This class must be constructed before any users are logged in, i.e., before
// any profiles are created or added to the ProfileManager. Additionally,
@@ -216,13 +217,15 @@ void WakeOnWifiManager::OnPreferenceChanged(
base::Bind(&base::DoNothing),
network_handler::ErrorCallback());
- bool wake_from_suspend = IsWakeOnPacketEnabled(current_feature_);
+ bool wake_on_packet_enabled = IsWakeOnPacketEnabled(current_feature_);
for (const auto& kv_pair : connection_observers_) {
Profile* profile = kv_pair.first;
gcm::GCMProfileServiceFactory::GetForProfile(profile)
->driver()
- ->WakeFromSuspendForHeartbeat(wake_from_suspend);
+ ->WakeFromSuspendForHeartbeat(wake_on_packet_enabled);
}
+
+ extension_event_observer_->SetShouldDelaySuspend(wake_on_packet_enabled);
}
bool WakeOnWifiManager::WakeOnWifiSupported() {

Powered by Google App Engine
This is Rietveld 408576698