Chromium Code Reviews| 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 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 388 virtual void ShowCursor(bool visible) OVERRIDE; | 388 virtual void ShowCursor(bool visible) OVERRIDE; |
| 389 | 389 |
| 390 static Shell* instance_; | 390 static Shell* instance_; |
| 391 | 391 |
| 392 // If set before the Shell is initialized, the mouse cursor will be hidden | 392 // If set before the Shell is initialized, the mouse cursor will be hidden |
| 393 // when the screen is initially created. | 393 // when the screen is initially created. |
| 394 static bool initially_hide_cursor_; | 394 static bool initially_hide_cursor_; |
| 395 | 395 |
| 396 ScreenAsh* screen_; | 396 ScreenAsh* screen_; |
| 397 | 397 |
| 398 // Active root window. Never become NULL. | 398 // Active root window. Never become NULL during the session. |
|
Daniel Erat
2012/07/23 20:47:57
nit: s/become/becomes/
oshima
2012/07/23 21:15:39
Done.
| |
| 399 aura::RootWindow* active_root_window_; | 399 aura::RootWindow* active_root_window_; |
| 400 | 400 |
| 401 // The CompoundEventFilter owned by aura::Env object. | 401 // The CompoundEventFilter owned by aura::Env object. |
| 402 aura::shared::CompoundEventFilter* env_filter_; | 402 aura::shared::CompoundEventFilter* env_filter_; |
| 403 | 403 |
| 404 std::vector<WindowAndBoundsPair> to_restore_; | 404 std::vector<WindowAndBoundsPair> to_restore_; |
| 405 | 405 |
| 406 #if !defined(OS_MACOSX) | 406 #if !defined(OS_MACOSX) |
| 407 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_; | 407 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_; |
| 408 | 408 |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 482 | 482 |
| 483 // Used by ash/shell. | 483 // Used by ash/shell. |
| 484 content::BrowserContext* browser_context_; | 484 content::BrowserContext* browser_context_; |
| 485 | 485 |
| 486 DISALLOW_COPY_AND_ASSIGN(Shell); | 486 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 487 }; | 487 }; |
| 488 | 488 |
| 489 } // namespace ash | 489 } // namespace ash |
| 490 | 490 |
| 491 #endif // ASH_SHELL_H_ | 491 #endif // ASH_SHELL_H_ |
| OLD | NEW |