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

Side by Side Diff: ash/shell.h

Issue 10383223: Revert 137549 because it broke win_aura and linux_chromeos_clang compile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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
« no previous file with comments | « ash/ash_switches.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Deleted: svn:mergeinfo
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 #pragma once 7 #pragma once
8 8
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 class PartialScreenshotEventFilter; 79 class PartialScreenshotEventFilter;
80 class ResizeShadowController; 80 class ResizeShadowController;
81 class RootWindowLayoutManager; 81 class RootWindowLayoutManager;
82 class ScreenDimmer; 82 class ScreenDimmer;
83 class ShadowController; 83 class ShadowController;
84 class ShelfLayoutManager; 84 class ShelfLayoutManager;
85 class ShellContextMenu; 85 class ShellContextMenu;
86 class SystemGestureEventFilter; 86 class SystemGestureEventFilter;
87 class StackingController; 87 class StackingController;
88 class TooltipController; 88 class TooltipController;
89 class TouchObserverHUD;
90 class VisibilityController; 89 class VisibilityController;
91 class WindowModalityController; 90 class WindowModalityController;
92 class WorkspaceController; 91 class WorkspaceController;
93 } 92 }
94 93
95 // Shell is a singleton object that presents the Shell API and implements the 94 // Shell is a singleton object that presents the Shell API and implements the
96 // RootWindow's delegate interface. 95 // RootWindow's delegate interface.
97 // 96 //
98 // Upon creation, the Shell sets itself as the RootWindow's delegate, which 97 // Upon creation, the Shell sets itself as the RootWindow's delegate, which
99 // takes ownership of the Shell. 98 // takes ownership of the Shell.
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 scoped_ptr<internal::SystemGestureEventFilter> system_gesture_filter_; 361 scoped_ptr<internal::SystemGestureEventFilter> system_gesture_filter_;
363 362
364 #if !defined(OS_MACOSX) 363 #if !defined(OS_MACOSX)
365 // An event filter that pre-handles global accelerators. 364 // An event filter that pre-handles global accelerators.
366 scoped_ptr<internal::AcceleratorFilter> accelerator_filter_; 365 scoped_ptr<internal::AcceleratorFilter> accelerator_filter_;
367 #endif 366 #endif
368 367
369 // An event filter that pre-handles all key events to send them to an IME. 368 // An event filter that pre-handles all key events to send them to an IME.
370 scoped_ptr<aura::shared::InputMethodEventFilter> input_method_filter_; 369 scoped_ptr<aura::shared::InputMethodEventFilter> input_method_filter_;
371 370
372 // An event filter that silently keeps track of all touch events and controls
373 // a heads-up display. This is enabled only if --ash-touch-hud flag is used.
374 scoped_ptr<internal::TouchObserverHUD> touch_observer_hud_;
375
376 // The shelf for managing the launcher and the status widget in non-compact 371 // The shelf for managing the launcher and the status widget in non-compact
377 // mode. Shell does not own the shelf. Instead, it is owned by container of 372 // mode. Shell does not own the shelf. Instead, it is owned by container of
378 // the status area. 373 // the status area.
379 internal::ShelfLayoutManager* shelf_; 374 internal::ShelfLayoutManager* shelf_;
380 375
381 // Manages layout of panels. Owned by PanelContainer. 376 // Manages layout of panels. Owned by PanelContainer.
382 internal::PanelLayoutManager* panel_layout_manager_; 377 internal::PanelLayoutManager* panel_layout_manager_;
383 378
384 ObserverList<ShellObserver> observers_; 379 ObserverList<ShellObserver> observers_;
385 380
386 // Owned by aura::RootWindow, cached here for type safety. 381 // Owned by aura::RootWindow, cached here for type safety.
387 internal::RootWindowLayoutManager* root_window_layout_; 382 internal::RootWindowLayoutManager* root_window_layout_;
388 383
389 // System tray with clock, Wi-Fi signal, etc. 384 // System tray with clock, Wi-Fi signal, etc.
390 scoped_ptr<SystemTray> tray_; 385 scoped_ptr<SystemTray> tray_;
391 386
392 // Used by ash/shell. 387 // Used by ash/shell.
393 content::BrowserContext* browser_context_; 388 content::BrowserContext* browser_context_;
394 389
395 DISALLOW_COPY_AND_ASSIGN(Shell); 390 DISALLOW_COPY_AND_ASSIGN(Shell);
396 }; 391 };
397 392
398 } // namespace ash 393 } // namespace ash
399 394
400 #endif // ASH_SHELL_H_ 395 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/ash_switches.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698