chrome/browser/chromeos/login/shutdown_button.cc - Issue 8537001: chromeos: Power manager client calls shutdown and restart

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/shutdown_button.cc

Issue 8537001: chromeos: Power manager client calls shutdown and restart (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: removed DCHECK for power library Created 9 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/chromeos/login/shutdown_button.cc

diff --git a/chrome/browser/chromeos/login/shutdown_button.cc b/chrome/browser/chromeos/login/shutdown_button.cc

index 3b9e6cbb15f6f5a95b448c7858e58c5b8cf6934d..d654b4f6ba105aca9ff005a8374f64d68a89a7a8 100644

--- a/chrome/browser/chromeos/login/shutdown_button.cc

+++ b/chrome/browser/chromeos/login/shutdown_button.cc

@@ -6,7 +6,8 @@

#include "base/utf_string_conversions.h"

#include "chrome/browser/chromeos/cros/cros_library.h"

-#include "chrome/browser/chromeos/cros/power_library.h"

+#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"

+#include "chrome/browser/chromeos/dbus/power_manager_client.h"

#include "chrome/browser/chromeos/login/rounded_rect_painter.h"

#include "chrome/browser/chromeos/view_ids.h"

#include "grit/generated_resources.h"

@@ -114,8 +115,7 @@ void ShutdownButton::OnLocaleChanged() {

void ShutdownButton::ButtonPressed(views::Button* sender,

const views::Event& event) {

- DCHECK(CrosLibrary::Get()->EnsureLoaded());

- CrosLibrary::Get()->GetPowerLibrary()->RequestShutdown();

+ DBusThreadManager::Get()->GetPowerManagerClient()->RequestShutdown();

}

} // namespace chromeos