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

Side by Side Diff: chrome/browser/chromeos/power/light_bar.cc

Issue 808783003: Revert of Enable dark_resume_always workaround if the wake-on-packets flag is set (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/chromeos/power/light_bar.h" 5 #include "chrome/browser/chromeos/power/light_bar.h"
6 6
7 #include <cstring> // needed for strlen() 7 #include <cstring> // needed for strlen()
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "chromeos/chromeos_switches.h" 13 #include "chromeos/chromeos_switches.h"
14 #include "chromeos/dbus/dbus_thread_manager.h" 14 #include "chromeos/dbus/dbus_thread_manager.h"
15 15
16 namespace chromeos { 16 namespace chromeos {
17 17
18 namespace { 18 namespace {
19 const int kDarkSuspendDelaySeconds = 4; 19 const int kDarkSuspendDelaySeconds = 4;
20 const char kLightBarControlPath[] = 20 const char kLightBarControlPath[] =
21 "/sys/devices/platform/cros_ec_lpc.0/cros-ec-dev.0/chromeos/cros_ec/" 21 "/sys/devices/platform/cros_ec_lpc.0/cros-ec-dev.0/chromeos/cros_ec/"
22 "lightbar/sequence"; 22 "lightbar/sequence";
23 const char kKonamiCommand[] = "KONAMI"; 23 const char kKonamiCommand[] = "KONAMI";
24 24
25 // TODO(chirantan): These are used by a temporary workaround for lucid sleep and
26 // should be removed once the proper implementation is ready (crbug.com/414949).
27 const char kDarkResumeAlwaysFile[] = "/sys/power/dark_resume_always";
28 const char kEnableDarkResumeAlways[] = "1";
29
30 } // namespace 25 } // namespace
31 26
32 LightBar::LightBar() 27 LightBar::LightBar()
33 : control_path_(base::FilePath(kLightBarControlPath)), 28 : control_path_(base::FilePath(kLightBarControlPath)),
34 has_light_bar_(base::PathIsWritable(control_path_)) { 29 has_light_bar_(base::PathIsWritable(control_path_)) {
35 DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this); 30 DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
36
37 // Until the kernel can properly detect the wakeup source, we need to use a
38 // hack to tell the kernel to always enter dark resume. Chrome can then
39 // detect any user activity and have the power manager transition out of dark
40 // resume into regular resume. We don't care if the write succeeds or not
41 // because most devices will not have this file.
42 //
43 // TODO(chirantan): Remove this once we can properly detect the wakeup
44 // source (crbug.com/414949).
45 base::WriteFile(base::FilePath(kDarkResumeAlwaysFile),
46 kEnableDarkResumeAlways,
47 strlen(kEnableDarkResumeAlways));
48 } 31 }
49 32
50 LightBar::~LightBar() { 33 LightBar::~LightBar() {
51 DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this); 34 DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
52 } 35 }
53 36
54 void LightBar::DarkSuspendImminent() { 37 void LightBar::DarkSuspendImminent() {
55 // The plan is to track the progress of push events and then re-suspend as 38 // The plan is to track the progress of push events and then re-suspend as
56 // soon as we know they have been processed. In the meanwhile, we can hack 39 // soon as we know they have been processed. In the meanwhile, we can hack
57 // around this by just having the light bar delay for a long time so that 40 // around this by just having the light bar delay for a long time so that
(...skipping 10 matching lines...) Expand all
68 51
69 if (!has_light_bar_) 52 if (!has_light_bar_)
70 return; 53 return;
71 54
72 if (base::WriteFile(control_path_, kKonamiCommand, strlen(kKonamiCommand)) != 55 if (base::WriteFile(control_path_, kKonamiCommand, strlen(kKonamiCommand)) !=
73 static_cast<int>(strlen(kKonamiCommand))) 56 static_cast<int>(strlen(kKonamiCommand)))
74 PLOG(WARNING) << "Unable to flash light bar during dark resume."; 57 PLOG(WARNING) << "Unable to flash light bar during dark resume.";
75 } 58 }
76 59
77 } // namespace chromeos 60 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698