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

Unified Diff: chrome/browser/ui/browser.cc

Issue 8834006: Add shutdown option to wrench menu. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: build break Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/toolbar/wrench_menu_model_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.cc
===================================================================
--- chrome/browser/ui/browser.cc (revision 112953)
+++ chrome/browser/ui/browser.cc (working copy)
@@ -189,6 +189,8 @@
#include "chrome/browser/chromeos/boot_times_loader.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/cros/screen_lock_library.h"
+#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
+#include "chrome/browser/chromeos/dbus/power_manager_client.h"
#include "chrome/browser/ui/webui/active_downloads_ui.h"
#endif
@@ -2245,6 +2247,12 @@
NotifyScreenLockRequested();
}
+void Browser::Shutdown() {
+ UserMetrics::RecordAction(UserMetricsAction("Shutdown"));
+ chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
+ RequestShutdown();
+}
+
void Browser::OpenSystemOptionsDialog() {
UserMetrics::RecordAction(UserMetricsAction("OpenSystemOptionsDialog"));
ShowOptionsTab(chrome::kSystemOptionsSubPage);
@@ -2850,6 +2858,7 @@
case IDC_HELP_PAGE: ShowHelpTab(); break;
#if defined(OS_CHROMEOS)
case IDC_LOCK_SCREEN: LockScreen(); break;
+ case IDC_SHUTDOWN: Shutdown(); break;
case IDC_FILE_MANAGER: OpenFileManager(); break;
case IDC_SYSTEM_OPTIONS: OpenSystemOptionsDialog(); break;
case IDC_INTERNET_OPTIONS: OpenInternetOptionsDialog(); break;
@@ -4365,6 +4374,7 @@
#if defined(OS_CHROMEOS)
command_updater_.UpdateCommandEnabled(IDC_LOCK_SCREEN, true);
+ command_updater_.UpdateCommandEnabled(IDC_SHUTDOWN, true);
command_updater_.UpdateCommandEnabled(IDC_FILE_MANAGER, true);
command_updater_.UpdateCommandEnabled(IDC_SEARCH, true);
command_updater_.UpdateCommandEnabled(IDC_SHOW_KEYBOARD_OVERLAY, true);
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/toolbar/wrench_menu_model_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698