diff options
| author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-18 01:56:59 +0000 |
|---|---|---|
| committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-18 01:56:59 +0000 |
| commit | df93e1078d1dffde419794de83c1ce71eb1163e6 (patch) | |
| tree | 0c619b59864bbb5b11ff31af6bf2413d3983f295 | |
| parent | a11d0e8f97b0f147b99511eaddb13e0af2e40f1a (diff) | |
| download | chromium_src-df93e1078d1dffde419794de83c1ce71eb1163e6.zip chromium_src-df93e1078d1dffde419794de83c1ce71eb1163e6.tar.gz chromium_src-df93e1078d1dffde419794de83c1ce71eb1163e6.tar.bz2 | |
Fix the ash_shell check fail issue caused by PowerManagerHandler not initialized.
BUG=241690
TBR=sky
Review URL: https://chromiumcodereview.appspot.com/15305006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200953 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/shell/content_client/shell_browser_main_parts.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc index 7046ee3..5f4895a 100644 --- a/ash/shell/content_client/shell_browser_main_parts.cc +++ b/ash/shell/content_client/shell_browser_main_parts.cc @@ -40,6 +40,7 @@ #if defined(OS_CHROMEOS) #include "chromeos/audio/cras_audio_handler.h" #include "chromeos/dbus/dbus_thread_manager.h" +#include "chromeos/power/power_manager_handler.h" #endif namespace ash { @@ -119,6 +120,7 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() { // is absent. chromeos::CrasAudioHandler::InitializeForTesting(); } + chromeos::PowerManagerHandler::Initialize(); #endif ash::Shell::CreateInstance(delegate_); @@ -154,6 +156,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() { message_center::MessageCenter::Shutdown(); #if defined(OS_CHROMEOS) + chromeos::PowerManagerHandler::Shutdown(); if (ash::switches::UseNewAudioHandler()) chromeos::CrasAudioHandler::Shutdown(); #endif |