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

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

Issue 11594004: Revert 173417 - Broke on win_aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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_unittest.cc ('k') | ash/wm/ash_activation_controller.cc » ('j') | 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 #ifndef ASH_WM_ASH_ACTIVATION_CONTROLLER_H_ 5 #ifndef ASH_WM_ASH_ACTIVATION_CONTROLLER_H_
6 #define ASH_WM_ASH_ACTIVATION_CONTROLLER_H_ 6 #define ASH_WM_ASH_ACTIVATION_CONTROLLER_H_
7 7
8 #include "ash/ash_export.h"
9 #include "ash/wm/activation_controller_delegate.h" 8 #include "ash/wm/activation_controller_delegate.h"
10 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
11 #include "base/basictypes.h" 10 #include "base/basictypes.h"
12 11
13 namespace ash { 12 namespace ash {
14 namespace internal { 13 namespace internal {
15 14
16 class ASH_EXPORT AshActivationController : public ActivationControllerDelegate { 15 class AshActivationController : public ActivationControllerDelegate {
17 public: 16 public:
18 AshActivationController(); 17 AshActivationController();
19 virtual ~AshActivationController(); 18 virtual ~AshActivationController();
20 19
21 private: 20 private:
22 // Overridden from ActivationControllerDelegate: 21 // Overridden from ActivationControllerDelegate:
23 virtual aura::Window* WillActivateWindow(aura::Window* window) OVERRIDE; 22 virtual aura::Window* WillActivateWindow(aura::Window* window) OVERRIDE;
24 virtual aura::Window* WillFocusWindow(aura::Window* window) OVERRIDE; 23 virtual aura::Window* WillFocusWindow(aura::Window* window) OVERRIDE;
25 24
26 // Returns a handle to the launcher on the active root window which will
27 // be activated as fallback. Also notifies the launcher, so it can return
28 // true from Launcher::CanActivate().
29 aura::Window* PrepareToActivateLauncher();
30
31 DISALLOW_COPY_AND_ASSIGN(AshActivationController); 25 DISALLOW_COPY_AND_ASSIGN(AshActivationController);
32 }; 26 };
33 27
34 } // namespace internal 28 } // namespace internal
35 } // namespace ash 29 } // namespace ash
36 30
37 #endif // ASH_WM_ASH_ACTIVATION_CONTROLLER_H_ 31 #endif // ASH_WM_ASH_ACTIVATION_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/launcher/launcher_unittest.cc ('k') | ash/wm/ash_activation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698