diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 21:42:35 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 21:42:35 +0000 |
| commit | dc904a636d578e2134e5911c98b7e00831be5bd8 (patch) | |
| tree | 8341a71bcb4138695f1a79437ae3be93ea8f2611 /ash/accelerators | |
| parent | 3159ca547dd7af238e0f18c1a33c1b3f6e830d22 (diff) | |
| download | chromium_src-dc904a636d578e2134e5911c98b7e00831be5bd8.zip chromium_src-dc904a636d578e2134e5911c98b7e00831be5bd8.tar.gz chromium_src-dc904a636d578e2134e5911c98b7e00831be5bd8.tar.bz2 | |
More work to make ash_unittests pass when we require context.
With the context checking DCHECK, ash_unittests and unit_tests now run on chromeos.
BUG=161882
Review URL: https://chromiumcodereview.appspot.com/11801027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175892 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index e2399f2..2827d91 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -629,7 +629,7 @@ bool AcceleratorController::PerformAction(int action, case SHOW_OAK: if (CommandLine::ForCurrentProcess()->HasSwitch( switches::kAshEnableOak)) { - oak::ShowOakWindow(); + oak::ShowOakWindowWithContext(Shell::GetPrimaryRootWindow()); return true; } break; |