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

Side by Side Diff: ash/shell.h

Issue 10388032: Move app list from ash to ui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: fix win_aura bot and comments in #5 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.gyp ('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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 class ScreenAsh; 55 class ScreenAsh;
56 class ShellDelegate; 56 class ShellDelegate;
57 class ShellObserver; 57 class ShellObserver;
58 class SystemTrayDelegate; 58 class SystemTrayDelegate;
59 class SystemTray; 59 class SystemTray;
60 class UserWallpaperDelegate; 60 class UserWallpaperDelegate;
61 class VideoDetector; 61 class VideoDetector;
62 class WindowCycleController; 62 class WindowCycleController;
63 63
64 namespace internal { 64 namespace internal {
65 class AcceleratorFilter;
65 class ActivationController; 66 class ActivationController;
66 class AcceleratorFilter; 67 class AppListController;
67 class AppList;
68 class DragDropController; 68 class DragDropController;
69 class EventClientImpl; 69 class EventClientImpl;
70 class FocusCycler; 70 class FocusCycler;
71 class InputMethodEventFilter; 71 class InputMethodEventFilter;
72 class KeyRewriterEventFilter; 72 class KeyRewriterEventFilter;
73 class MagnificationController; 73 class MagnificationController;
74 class MonitorController; 74 class MonitorController;
75 class PanelLayoutManager; 75 class PanelLayoutManager;
76 class PartialScreenshotEventFilter; 76 class PartialScreenshotEventFilter;
77 class ResizeShadowController; 77 class ResizeShadowController;
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 316
317 scoped_ptr<AcceleratorController> accelerator_controller_; 317 scoped_ptr<AcceleratorController> accelerator_controller_;
318 #endif // !defined(OS_MACOSX) 318 #endif // !defined(OS_MACOSX)
319 319
320 scoped_ptr<ShellDelegate> delegate_; 320 scoped_ptr<ShellDelegate> delegate_;
321 scoped_ptr<SystemTrayDelegate> tray_delegate_; 321 scoped_ptr<SystemTrayDelegate> tray_delegate_;
322 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; 322 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
323 323
324 scoped_ptr<Launcher> launcher_; 324 scoped_ptr<Launcher> launcher_;
325 325
326 scoped_ptr<internal::AppList> app_list_; 326 scoped_ptr<internal::AppListController> app_list_controller_;
327 327
328 scoped_ptr<internal::ShellContextMenu> shell_context_menu_; 328 scoped_ptr<internal::ShellContextMenu> shell_context_menu_;
329 scoped_ptr<internal::StackingController> stacking_controller_; 329 scoped_ptr<internal::StackingController> stacking_controller_;
330 scoped_ptr<internal::ActivationController> activation_controller_; 330 scoped_ptr<internal::ActivationController> activation_controller_;
331 scoped_ptr<internal::WindowModalityController> window_modality_controller_; 331 scoped_ptr<internal::WindowModalityController> window_modality_controller_;
332 scoped_ptr<internal::DragDropController> drag_drop_controller_; 332 scoped_ptr<internal::DragDropController> drag_drop_controller_;
333 scoped_ptr<internal::WorkspaceController> workspace_controller_; 333 scoped_ptr<internal::WorkspaceController> workspace_controller_;
334 scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_; 334 scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_;
335 scoped_ptr<internal::ShadowController> shadow_controller_; 335 scoped_ptr<internal::ShadowController> shadow_controller_;
336 scoped_ptr<internal::TooltipController> tooltip_controller_; 336 scoped_ptr<internal::TooltipController> tooltip_controller_;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 381
382 // Used by ash/shell. 382 // Used by ash/shell.
383 content::BrowserContext* browser_context_; 383 content::BrowserContext* browser_context_;
384 384
385 DISALLOW_COPY_AND_ASSIGN(Shell); 385 DISALLOW_COPY_AND_ASSIGN(Shell);
386 }; 386 };
387 387
388 } // namespace ash 388 } // namespace ash
389 389
390 #endif // ASH_SHELL_H_ 390 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698