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

Side by Side Diff: ash/shell.h

Issue 10514008: Add WebNotificationTray (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 6 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 #pragma once 7 #pragma once
8 8
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 class Launcher; 64 class Launcher;
65 class NestedDispatcherController; 65 class NestedDispatcherController;
66 class PowerButtonController; 66 class PowerButtonController;
67 class ScreenAsh; 67 class ScreenAsh;
68 class ShellDelegate; 68 class ShellDelegate;
69 class ShellObserver; 69 class ShellObserver;
70 class SystemTrayDelegate; 70 class SystemTrayDelegate;
71 class SystemTray; 71 class SystemTray;
72 class UserWallpaperDelegate; 72 class UserWallpaperDelegate;
73 class VideoDetector; 73 class VideoDetector;
74 class WebNotificationTray;
74 class WindowCycleController; 75 class WindowCycleController;
75 76
76 namespace internal { 77 namespace internal {
77 class AcceleratorFilter; 78 class AcceleratorFilter;
78 class ActivationController; 79 class ActivationController;
79 class AppListController; 80 class AppListController;
80 class DragDropController; 81 class DragDropController;
81 class EventClientImpl; 82 class EventClientImpl;
82 class FocusCycler; 83 class FocusCycler;
83 class KeyRewriterEventFilter; 84 class KeyRewriterEventFilter;
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 287
287 // TODO(sky): don't expose this! 288 // TODO(sky): don't expose this!
288 internal::ShelfLayoutManager* shelf() const { return shelf_; } 289 internal::ShelfLayoutManager* shelf() const { return shelf_; }
289 290
290 internal::StatusAreaWidget* status_area_widget() const { 291 internal::StatusAreaWidget* status_area_widget() const {
291 return status_area_widget_; 292 return status_area_widget_;
292 } 293 }
293 294
294 SystemTray* system_tray() const { return system_tray_.get(); } 295 SystemTray* system_tray() const { return system_tray_.get(); }
295 296
297 WebNotificationTray* web_notification_tray() const {
298 return web_notification_tray_.get();
299 }
300
296 // Returns the size of the grid. 301 // Returns the size of the grid.
297 int GetGridSize() const; 302 int GetGridSize() const;
298 303
299 // Returns true if in maximized or fullscreen mode. 304 // Returns true if in maximized or fullscreen mode.
300 bool IsInMaximizedMode() const; 305 bool IsInMaximizedMode() const;
301 306
302 static void set_initially_hide_cursor(bool hide) { 307 static void set_initially_hide_cursor(bool hide) {
303 initially_hide_cursor_ = hide; 308 initially_hide_cursor_ = hide;
304 } 309 }
305 310
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 444
440 // Owned by aura::RootWindow, cached here for type safety. 445 // Owned by aura::RootWindow, cached here for type safety.
441 internal::RootWindowLayoutManager* root_window_layout_; 446 internal::RootWindowLayoutManager* root_window_layout_;
442 447
443 // Widget containing system tray. 448 // Widget containing system tray.
444 internal::StatusAreaWidget* status_area_widget_; 449 internal::StatusAreaWidget* status_area_widget_;
445 450
446 // System tray with clock, Wi-Fi signal, etc. 451 // System tray with clock, Wi-Fi signal, etc.
447 scoped_ptr<SystemTray> system_tray_; 452 scoped_ptr<SystemTray> system_tray_;
448 453
454 // Tray for web notifications.
455 scoped_ptr<WebNotificationTray> web_notification_tray_;
456
449 // Used by ash/shell. 457 // Used by ash/shell.
450 content::BrowserContext* browser_context_; 458 content::BrowserContext* browser_context_;
451 459
452 DISALLOW_COPY_AND_ASSIGN(Shell); 460 DISALLOW_COPY_AND_ASSIGN(Shell);
453 }; 461 };
454 462
455 } // namespace ash 463 } // namespace ash
456 464
457 #endif // ASH_SHELL_H_ 465 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/ash_strings.grd ('k') | ash/shell.cc » ('j') | ash/system/status_area_widget_delegate.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698