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

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

Issue 11418224: Eliminates all ash dependencies from WindowModalityController. (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/test/child_modal_window.cc ('k') | ash/wm/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_ACTIVATION_CONTROLLER_H_ 5 #ifndef ASH_WM_ACTIVATION_CONTROLLER_H_
6 #define ASH_WM_ACTIVATION_CONTROLLER_H_ 6 #define ASH_WM_ACTIVATION_CONTROLLER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 const ui::Event* event); 48 const ui::Event* event);
49 49
50 // Overridden from aura::client::ActivationClient: 50 // Overridden from aura::client::ActivationClient:
51 virtual void AddObserver( 51 virtual void AddObserver(
52 aura::client::ActivationChangeObserver* observer) OVERRIDE; 52 aura::client::ActivationChangeObserver* observer) OVERRIDE;
53 virtual void RemoveObserver( 53 virtual void RemoveObserver(
54 aura::client::ActivationChangeObserver* observer) OVERRIDE; 54 aura::client::ActivationChangeObserver* observer) OVERRIDE;
55 virtual void ActivateWindow(aura::Window* window) OVERRIDE; 55 virtual void ActivateWindow(aura::Window* window) OVERRIDE;
56 virtual void DeactivateWindow(aura::Window* window) OVERRIDE; 56 virtual void DeactivateWindow(aura::Window* window) OVERRIDE;
57 virtual aura::Window* GetActiveWindow() OVERRIDE; 57 virtual aura::Window* GetActiveWindow() OVERRIDE;
58 virtual aura::Window* GetActivatableWindow(aura::Window* window) OVERRIDE;
58 virtual bool OnWillFocusWindow(aura::Window* window, 59 virtual bool OnWillFocusWindow(aura::Window* window,
59 const ui::Event* event) OVERRIDE; 60 const ui::Event* event) OVERRIDE;
60 virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE; 61 virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE;
61 62
62 // Overridden from aura::WindowObserver: 63 // Overridden from aura::WindowObserver:
63 virtual void OnWindowVisibilityChanged(aura::Window* window, 64 virtual void OnWindowVisibilityChanged(aura::Window* window,
64 bool visible) OVERRIDE; 65 bool visible) OVERRIDE;
65 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; 66 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
66 67
67 // Overridden from aura::EnvObserver: 68 // Overridden from aura::EnvObserver:
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 115
115 scoped_ptr<ActivationControllerDelegate> delegate_; 116 scoped_ptr<ActivationControllerDelegate> delegate_;
116 117
117 DISALLOW_COPY_AND_ASSIGN(ActivationController); 118 DISALLOW_COPY_AND_ASSIGN(ActivationController);
118 }; 119 };
119 120
120 } // namespace internal 121 } // namespace internal
121 } // namespace ash 122 } // namespace ash
122 123
123 #endif // ASH_WM_ACTIVATION_CONTROLLER_H_ 124 #endif // ASH_WM_ACTIVATION_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/test/child_modal_window.cc ('k') | ash/wm/activation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698