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 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
241 // Adds/removes observer. | 241 // Adds/removes observer. |
242 void AddShellObserver(ShellObserver* observer); | 242 void AddShellObserver(ShellObserver* observer); |
243 void RemoveShellObserver(ShellObserver* observer); | 243 void RemoveShellObserver(ShellObserver* observer); |
244 | 244 |
245 #if !defined(OS_MACOSX) | 245 #if !defined(OS_MACOSX) |
246 AcceleratorController* accelerator_controller() { | 246 AcceleratorController* accelerator_controller() { |
247 return accelerator_controller_.get(); | 247 return accelerator_controller_.get(); |
248 } | 248 } |
249 #endif // !defined(OS_MACOSX) | 249 #endif // !defined(OS_MACOSX) |
250 | 250 |
| 251 internal::ActivationController* activation_controller() { |
| 252 return activation_controller_.get(); |
| 253 } |
| 254 |
251 aura::shared::CompoundEventFilter* env_filter() { | 255 aura::shared::CompoundEventFilter* env_filter() { |
252 return env_filter_; | 256 return env_filter_; |
253 } | 257 } |
254 internal::TooltipController* tooltip_controller() { | 258 internal::TooltipController* tooltip_controller() { |
255 return tooltip_controller_.get(); | 259 return tooltip_controller_.get(); |
256 } | 260 } |
257 internal::EventRewriterEventFilter* event_rewriter_filter() { | 261 internal::EventRewriterEventFilter* event_rewriter_filter() { |
258 return event_rewriter_filter_.get(); | 262 return event_rewriter_filter_.get(); |
259 } | 263 } |
260 internal::PartialScreenshotEventFilter* partial_screenshot_filter() { | 264 internal::PartialScreenshotEventFilter* partial_screenshot_filter() { |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
481 | 485 |
482 // Used by ash/shell. | 486 // Used by ash/shell. |
483 content::BrowserContext* browser_context_; | 487 content::BrowserContext* browser_context_; |
484 | 488 |
485 DISALLOW_COPY_AND_ASSIGN(Shell); | 489 DISALLOW_COPY_AND_ASSIGN(Shell); |
486 }; | 490 }; |
487 | 491 |
488 } // namespace ash | 492 } // namespace ash |
489 | 493 |
490 #endif // ASH_SHELL_H_ | 494 #endif // ASH_SHELL_H_ |
OLD | NEW |