diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 16:23:28 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 16:23:28 +0000 |
| commit | 09c6943d4ff83987c41826a4a8c27a9e3a462df2 (patch) | |
| tree | 931443864a7dc0b49ce010d243b3c7c62076a777 /ash/wm/window_util.cc | |
| parent | 29f16dc62ed629048ab8f890aff5ef7cf410772f (diff) | |
| download | chromium_src-09c6943d4ff83987c41826a4a8c27a9e3a462df2.zip chromium_src-09c6943d4ff83987c41826a4a8c27a9e3a462df2.tar.gz chromium_src-09c6943d4ff83987c41826a4a8c27a9e3a462df2.tar.bz2 | |
Gets instant to correctly commit under aura. This was broke for a
couple of reasons:
. RWHVA was never told it was going to become active by way of a
mouse. I fixed this by wiring through the event to
ActivationDelegate::ShouldActivate.
. OmniboxViewViews wasn't telling the model the native view that is
getting focus. I've modified OmniboxViewViews to get the focused
window from the RootWindow.
. OmniboxViewViews was never being told it's losing focus. The call to
BrowserWindow::WebContentsFocused initiates that.
There is a slew of interactive ui tests that exercise this code. They
are currently disabled on linux. Separately I'll see I can reenable
them.
BUG=116940
TEST=make sure instant works correctly on aura.
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9700078
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127172 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_util.cc')
| -rw-r--r-- | ash/wm/window_util.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/wm/window_util.cc b/ash/wm/window_util.cc index d45c061..3695f86 100644 --- a/ash/wm/window_util.cc +++ b/ash/wm/window_util.cc @@ -50,7 +50,7 @@ aura::Window* GetActiveWindow() { } aura::Window* GetActivatableWindow(aura::Window* window) { - return internal::ActivationController::GetActivatableWindow(window); + return internal::ActivationController::GetActivatableWindow(window, NULL); } bool IsWindowNormal(aura::Window* window) { |