OLD | NEW |
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_SHELL_H_ | 5 #ifndef ASH_SHELL_H_ |
6 #define ASH_SHELL_H_ | 6 #define ASH_SHELL_H_ |
7 | 7 |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
246 // Adds/removes observer. | 246 // Adds/removes observer. |
247 void AddShellObserver(ShellObserver* observer); | 247 void AddShellObserver(ShellObserver* observer); |
248 void RemoveShellObserver(ShellObserver* observer); | 248 void RemoveShellObserver(ShellObserver* observer); |
249 | 249 |
250 #if !defined(OS_MACOSX) | 250 #if !defined(OS_MACOSX) |
251 AcceleratorController* accelerator_controller() { | 251 AcceleratorController* accelerator_controller() { |
252 return accelerator_controller_.get(); | 252 return accelerator_controller_.get(); |
253 } | 253 } |
254 #endif // !defined(OS_MACOSX) | 254 #endif // !defined(OS_MACOSX) |
255 | 255 |
| 256 internal::ActivationController* activation_controller() { |
| 257 return activation_controller_.get(); |
| 258 } |
| 259 |
256 aura::shared::CompoundEventFilter* env_filter() { | 260 aura::shared::CompoundEventFilter* env_filter() { |
257 return env_filter_; | 261 return env_filter_; |
258 } | 262 } |
259 internal::TooltipController* tooltip_controller() { | 263 internal::TooltipController* tooltip_controller() { |
260 return tooltip_controller_.get(); | 264 return tooltip_controller_.get(); |
261 } | 265 } |
262 internal::EventRewriterEventFilter* event_rewriter_filter() { | 266 internal::EventRewriterEventFilter* event_rewriter_filter() { |
263 return event_rewriter_filter_.get(); | 267 return event_rewriter_filter_.get(); |
264 } | 268 } |
265 internal::OverlayEventFilter* overlay_filter() { | 269 internal::OverlayEventFilter* overlay_filter() { |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
486 | 490 |
487 // Used by ash/shell. | 491 // Used by ash/shell. |
488 content::BrowserContext* browser_context_; | 492 content::BrowserContext* browser_context_; |
489 | 493 |
490 DISALLOW_COPY_AND_ASSIGN(Shell); | 494 DISALLOW_COPY_AND_ASSIGN(Shell); |
491 }; | 495 }; |
492 | 496 |
493 } // namespace ash | 497 } // namespace ash |
494 | 498 |
495 #endif // ASH_SHELL_H_ | 499 #endif // ASH_SHELL_H_ |
OLD | NEW |