Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Side by Side Diff: ash/wm/ash_activation_controller.cc

Issue 11451002: Focus launcher if spoken feedback is enabled and no other windows visible. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleaned up the code. Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/launcher/launcher.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/wm/ash_activation_controller.h" 5 #include "ash/wm/ash_activation_controller.h"
6 6
7 #include "ash/launcher/launcher.h"
7 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
8 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_delegate.h"
9 #include "ash/wm/activation_controller.h" 11 #include "ash/wm/activation_controller.h"
10 #include "ash/wm/property_util.h" 12 #include "ash/wm/property_util.h"
11 #include "ash/wm/window_util.h" 13 #include "ash/wm/window_util.h"
12 #include "ash/wm/workspace_controller.h" 14 #include "ash/wm/workspace_controller.h"
13 #include "ui/views/corewm/window_modality_controller.h" 15 #include "ui/views/corewm/window_modality_controller.h"
16 #include "ui/views/widget/widget.h"
14 17
15 namespace ash { 18 namespace ash {
16 namespace internal { 19 namespace internal {
17 20
18 //////////////////////////////////////////////////////////////////////////////// 21 ////////////////////////////////////////////////////////////////////////////////
19 // AshActivationController, public: 22 // AshActivationController, public:
20 23
21 AshActivationController::AshActivationController() { 24 AshActivationController::AshActivationController() {
22 } 25 }
23 26
24 AshActivationController::~AshActivationController() { 27 AshActivationController::~AshActivationController() {
25 } 28 }
26 29
27 //////////////////////////////////////////////////////////////////////////////// 30 ////////////////////////////////////////////////////////////////////////////////
28 // AshActivationController, ActivationControllerDelegate implementation: 31 // AshActivationController, ActivationControllerDelegate implementation:
29 32
30 aura::Window* AshActivationController::WillActivateWindow( 33 aura::Window* AshActivationController::WillActivateWindow(
31 aura::Window* window) { 34 aura::Window* window) {
32 aura::Window* window_modal_transient = 35 aura::Window* window_modal_transient =
33 views::corewm::GetModalTransient(window); 36 views::corewm::GetModalTransient(window);
34 if (window_modal_transient) 37 if (window_modal_transient)
35 return window_modal_transient; 38 return window_modal_transient;
36 39
40 // We want to allow to activate launcher only when invoked by focus cycler
41 // or as a fallback while Spoken feedback is enabled and no other windows
42 // on the screen are activeable.
43 Launcher* launcher;
sky 2012/12/05 05:01:09 Can we do all this if window is null and move to a
mtomasz 2012/12/07 06:18:47 Done.
44 if (Shell::IsLauncherPerDisplayEnabled()) {
45 launcher = GetRootWindowController(
46 Shell::GetActiveRootWindow())->launcher();
47 } else {
48 launcher = Launcher::ForPrimaryDisplay();
49 }
50 if (launcher) {
51 aura::Window* launcher_window = launcher->widget()->GetNativeWindow();
52 if (window == NULL) {
53 // Fallback to launcher when Spoken feedback is enabled.
54 launcher->WillActivateAsFallback();
55 window = launcher_window;
56 }
57 }
58
37 // Make sure the workspace manager switches to the workspace for window. 59 // Make sure the workspace manager switches to the workspace for window.
38 // Without this CanReceiveEvents() below returns false and activation never 60 // Without this CanReceiveEvents() below returns false and activation never
39 // changes. CanReceiveEvents() returns false if |window| isn't in the active 61 // changes. CanReceiveEvents() returns false if |window| isn't in the active
40 // workspace, in which case its parent is not visible. 62 // workspace, in which case its parent is not visible.
41 // TODO(sky): if I instead change the opacity of the parent this isn't an 63 // TODO(sky): if I instead change the opacity of the parent this isn't an
42 // issue, but will make animations trickier... Consider which one is better. 64 // issue, but will make animations trickier... Consider which one is better.
43 if (window) { 65 if (window) {
44 internal::RootWindowController* root_window_controller = 66 internal::RootWindowController* root_window_controller =
45 GetRootWindowController(window->GetRootWindow()); 67 GetRootWindowController(window->GetRootWindow());
46 root_window_controller->workspace_controller()-> 68 root_window_controller->workspace_controller()->
(...skipping 25 matching lines...) Expand all
72 aura::Window* window) { 94 aura::Window* window) {
73 aura::Window* window_modal_transient = 95 aura::Window* window_modal_transient =
74 views::corewm::GetModalTransient(window); 96 views::corewm::GetModalTransient(window);
75 if (window_modal_transient) 97 if (window_modal_transient)
76 return window_modal_transient; 98 return window_modal_transient;
77 return window; 99 return window;
78 } 100 }
79 101
80 } // namespace internal 102 } // namespace internal
81 } // namespace ash 103 } // namespace ash
OLDNEW
« no previous file with comments | « ash/launcher/launcher.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698