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

Side by Side Diff: ash/shell.h

Issue 10789018: aura: Add X11 host window management. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Keep ash switches alphabetized. Created 8 years, 5 months 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
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_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
11 #include "ash/ash_export.h" 11 #include "ash/ash_export.h"
12 #include "ash/system/user/login_status.h" 12 #include "ash/system/user/login_status.h"
13 #include "ash/wm/shelf_types.h" 13 #include "ash/wm/shelf_types.h"
14 #include "base/basictypes.h" 14 #include "base/basictypes.h"
15 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
16 #include "base/gtest_prod_util.h" 16 #include "base/gtest_prod_util.h"
17 #include "base/memory/scoped_ptr.h" 17 #include "base/memory/scoped_ptr.h"
18 #include "base/observer_list.h" 18 #include "base/observer_list.h"
19 #include "ui/aura/cursor_delegate.h" 19 #include "ui/aura/cursor_delegate.h"
20 #include "ui/gfx/insets.h" 20 #include "ui/gfx/insets.h"
21 #include "ui/gfx/size.h" 21 #include "ui/gfx/size.h"
22 22
23 class CommandLine; 23 class CommandLine;
24 24
25 namespace aura { 25 namespace aura {
26 class EventFilter; 26 class EventFilter;
27 class FocusManager; 27 class FocusManager;
28 #if defined(USE_X11)
29 class HostWindowManagerX11;
30 #endif
28 class RootWindow; 31 class RootWindow;
29 class Window; 32 class Window;
30 namespace client { 33 namespace client {
31 class UserActionClient; 34 class UserActionClient;
32 } 35 }
33 namespace shared { 36 namespace shared {
34 class CompoundEventFilter; 37 class CompoundEventFilter;
35 class InputMethodEventFilter; 38 class InputMethodEventFilter;
36 } 39 }
37 } 40 }
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 class WindowCycleController; 77 class WindowCycleController;
75 78
76 namespace internal { 79 namespace internal {
77 class AcceleratorFilter; 80 class AcceleratorFilter;
78 class ActivationController; 81 class ActivationController;
79 class AppListController; 82 class AppListController;
80 class CaptureController; 83 class CaptureController;
81 class DragDropController; 84 class DragDropController;
82 class EventRewriterEventFilter; 85 class EventRewriterEventFilter;
83 class FocusCycler; 86 class FocusCycler;
87 class HostWindowManager;
84 class MagnificationController; 88 class MagnificationController;
85 class DisplayController; 89 class DisplayController;
86 class MouseCursorEventFilter; 90 class MouseCursorEventFilter;
87 class PanelLayoutManager; 91 class PanelLayoutManager;
88 class PartialScreenshotEventFilter; 92 class PartialScreenshotEventFilter;
89 class ResizeShadowController; 93 class ResizeShadowController;
90 class RootWindowController; 94 class RootWindowController;
91 class RootWindowLayoutManager; 95 class RootWindowLayoutManager;
92 class ShadowController; 96 class ShadowController;
93 class ShelfLayoutManager; 97 class ShelfLayoutManager;
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 virtual void ShowCursor(bool visible) OVERRIDE; 388 virtual void ShowCursor(bool visible) OVERRIDE;
385 389
386 static Shell* instance_; 390 static Shell* instance_;
387 391
388 // 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
389 // when the screen is initially created. 393 // when the screen is initially created.
390 static bool initially_hide_cursor_; 394 static bool initially_hide_cursor_;
391 395
392 ScreenAsh* screen_; 396 ScreenAsh* screen_;
393 397
398 scoped_ptr<internal::HostWindowManager> host_window_manager_;
399 #if defined(USE_X11)
400 scoped_ptr<aura::HostWindowManagerX11> x11_host_window_manager_;
401 #endif
402
394 // Active root window. Never become NULL. 403 // Active root window. Never become NULL.
395 aura::RootWindow* active_root_window_; 404 aura::RootWindow* active_root_window_;
396 405
397 // The CompoundEventFilter owned by aura::Env object. 406 // The CompoundEventFilter owned by aura::Env object.
398 aura::shared::CompoundEventFilter* env_filter_; 407 aura::shared::CompoundEventFilter* env_filter_;
399 408
400 std::vector<WindowAndBoundsPair> to_restore_; 409 std::vector<WindowAndBoundsPair> to_restore_;
401 410
402 #if !defined(OS_MACOSX) 411 #if !defined(OS_MACOSX)
403 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_; 412 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_;
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 490
482 // Used by ash/shell. 491 // Used by ash/shell.
483 content::BrowserContext* browser_context_; 492 content::BrowserContext* browser_context_;
484 493
485 DISALLOW_COPY_AND_ASSIGN(Shell); 494 DISALLOW_COPY_AND_ASSIGN(Shell);
486 }; 495 };
487 496
488 } // namespace ash 497 } // namespace ash
489 498
490 #endif // ASH_SHELL_H_ 499 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698