diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 22:43:44 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 22:43:44 +0000 |
| commit | 550543e2cfacddb3340481a073968a0d2456b35c (patch) | |
| tree | fbfa945f03d6b96f221caa017a2d157d6f1e6662 /ash/shell.cc | |
| parent | f468b617d507e13fb33fb4d70f02a0525bbd40f7 (diff) | |
| download | chromium_src-550543e2cfacddb3340481a073968a0d2456b35c.zip chromium_src-550543e2cfacddb3340481a073968a0d2456b35c.tar.gz chromium_src-550543e2cfacddb3340481a073968a0d2456b35c.tar.bz2 | |
Fixes for FocusController to make it pass interactive_ui_tests.
http://crbug.com/162100
R=sky@chromium.org
Review URL: https://codereview.chromium.org/11809002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176455 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 4aa86ee..fc219da 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -233,7 +233,7 @@ Shell::~Shell() { // effects (e.g. crashes) from changing focus during shutdown. // See bug crbug.com/134502. if (active_root_window_) - aura::client::GetFocusClient(active_root_window_)->FocusWindow(NULL, NULL); + aura::client::GetFocusClient(active_root_window_)->FocusWindow(NULL); // Please keep in same order as in Init() because it's easy to miss one. RemovePreTargetHandler(user_activity_detector_.get()); |