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