From 5316f65efec32d2d3885a5aaa5b21552ac2f68c7 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Wed, 7 Mar 2012 23:59:22 +0000 Subject: ash: Fix crash when playing with brightness controller in uber tray menu. BUG=117059 R=sadrul@chromium.org,ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/9616041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125504 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/system/brightness/tray_brightness.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ash/system/brightness/tray_brightness.cc b/ash/system/brightness/tray_brightness.cc index 1a05fdd..0b60d9e 100644 --- a/ash/system/brightness/tray_brightness.cc +++ b/ash/system/brightness/tray_brightness.cc @@ -66,13 +66,13 @@ class BrightnessView : public views::View, // the amount the brightness should be increased/decreased. // http://crosbug.com/26935 #if !defined(OS_MACOSX) - ash::Shell* shell = ash::Shell::GetInstance(); - if (value < old_value) { - shell->accelerator_controller()->brightness_control_delegate()-> - HandleBrightnessDown(ui::Accelerator()); - } else { - shell->accelerator_controller()->brightness_control_delegate()-> - HandleBrightnessUp(ui::Accelerator()); + AcceleratorController* ac = Shell::GetInstance()->accelerator_controller(); + if (ac->brightness_control_delegate()) { + BrightnessControlDelegate* delegate = ac->brightness_control_delegate(); + if (value < old_value) + delegate->HandleBrightnessDown(ui::Accelerator()); + else + delegate->HandleBrightnessUp(ui::Accelerator()); } #endif // OS_MACOSX } -- cgit v1.1