| commit | 550543e2cfacddb3340481a073968a0d2456b35c | [log] [tgz] |
|---|---|---|
| author | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Fri Jan 11 22:43:44 2013 |
| committer | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Fri Jan 11 22:43:44 2013 |
| tree | fbfa945f03d6b96f221caa017a2d157d6f1e6662 | |
| parent | f468b617d507e13fb33fb4d70f02a0525bbd40f7 [diff] [blame] |
Fixes for FocusController to make it pass interactive_ui_tests. http://crbug.com/162100 [email protected] Review URL: https://codereview.chromium.org/11809002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176455 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc index 54aa82d..f50fcdc4 100644 --- a/ash/root_window_controller_unittest.cc +++ b/ash/root_window_controller_unittest.cc
@@ -160,7 +160,7 @@ aura::Window* d2 = CreateTestWindowInShellWithDelegate( &delete_on_blur_delegate, 0, gfx::Rect(50, 50, 100, 100)); delete_on_blur_delegate.SetWindow(d2); - aura::client::GetFocusClient(root_windows[0])->FocusWindow(d2, NULL); + aura::client::GetFocusClient(root_windows[0])->FocusWindow(d2); tracker.Add(d2); UpdateDisplay("600x600");