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

Side by Side Diff: ash/shell.h

Issue 9808026: Layout panels on top of their launcher icons (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: CR feedback Created 8 years, 8 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/launcher/launcher_view.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')
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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 namespace internal { 59 namespace internal {
60 class ActivationController; 60 class ActivationController;
61 class AcceleratorFilter; 61 class AcceleratorFilter;
62 class AppList; 62 class AppList;
63 class DragDropController; 63 class DragDropController;
64 class EventClientImpl; 64 class EventClientImpl;
65 class FocusCycler; 65 class FocusCycler;
66 class InputMethodEventFilter; 66 class InputMethodEventFilter;
67 class KeyRewriterEventFilter; 67 class KeyRewriterEventFilter;
68 class MonitorController; 68 class MonitorController;
69 class PanelLayoutManager;
69 class PartialScreenshotEventFilter; 70 class PartialScreenshotEventFilter;
70 class ResizeShadowController; 71 class ResizeShadowController;
71 class RootWindowEventFilter; 72 class RootWindowEventFilter;
72 class RootWindowLayoutManager; 73 class RootWindowLayoutManager;
73 class ShadowController; 74 class ShadowController;
74 class ShelfLayoutManager; 75 class ShelfLayoutManager;
75 class SystemGestureEventFilter; 76 class SystemGestureEventFilter;
76 class StackingController; 77 class StackingController;
77 class TooltipController; 78 class TooltipController;
78 class VisibilityController; 79 class VisibilityController;
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 #endif 325 #endif
325 326
326 // An event filter that pre-handles all key events to send them to an IME. 327 // An event filter that pre-handles all key events to send them to an IME.
327 scoped_ptr<internal::InputMethodEventFilter> input_method_filter_; 328 scoped_ptr<internal::InputMethodEventFilter> input_method_filter_;
328 329
329 // The shelf for managing the launcher and the status widget in non-compact 330 // The shelf for managing the launcher and the status widget in non-compact
330 // mode. Shell does not own the shelf. Instead, it is owned by container of 331 // mode. Shell does not own the shelf. Instead, it is owned by container of
331 // the status area. 332 // the status area.
332 internal::ShelfLayoutManager* shelf_; 333 internal::ShelfLayoutManager* shelf_;
333 334
335 // Manages layout of panels. Owned by PanelContainer.
336 internal::PanelLayoutManager* panel_layout_manager_;
337
334 ObserverList<ShellObserver> observers_; 338 ObserverList<ShellObserver> observers_;
335 339
336 // Owned by aura::RootWindow, cached here for type safety. 340 // Owned by aura::RootWindow, cached here for type safety.
337 internal::RootWindowLayoutManager* root_window_layout_; 341 internal::RootWindowLayoutManager* root_window_layout_;
338 342
339 // Status area with clock, Wi-Fi signal, etc. 343 // Status area with clock, Wi-Fi signal, etc.
340 views::Widget* status_widget_; 344 views::Widget* status_widget_;
341 345
342 // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for 346 // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for
343 // |status_widget_|). 347 // |status_widget_|).
344 scoped_ptr<SystemTray> tray_; 348 scoped_ptr<SystemTray> tray_;
345 349
346 DISALLOW_COPY_AND_ASSIGN(Shell); 350 DISALLOW_COPY_AND_ASSIGN(Shell);
347 }; 351 };
348 352
349 } // namespace ash 353 } // namespace ash
350 354
351 #endif // ASH_SHELL_H_ 355 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/launcher/launcher_view.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698